Skip to content

Commit edcb4c7

Browse files
committed
Code review feedback from review with Nick
1 parent 18f00c6 commit edcb4c7

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

lib/pbench/agent/tool_data_sink.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -649,10 +649,11 @@ def __init__(self, ext_benchmark_run_dir, int_pbench_run):
649649
# match.
650650
#
651651
# E.g.:
652-
# $ benchmark_run_dir = /home/<USER>/run-dir
653-
# $ cat /home/<USER>/run-dir/.path
652+
# $ pbench_run="/home/<USER>/run-dir"
653+
# $ benchmark_run_dir="${pbench_run}/script_config_<date>"
654+
# $ cat ${pbench_run}/.path
654655
# /home/<USER>/run-dir
655-
# $ podman run --volume /home/<USER>/run-dir:/var/lib/pbench-agent\
656+
# $ podman run --volume ${pbench_run}:/var/lib/pbench-agent \
656657
# pbench-agent-tool-data-sink bash
657658
# [ abcdefg /]$ cat /var/lib/pbench-agent/.path
658659
# /home/<USER>/run-dir
@@ -664,8 +665,9 @@ def __init__(self, ext_benchmark_run_dir, int_pbench_run):
664665
benchmark_run_dir_lcl = (
665666
self._int_pbench_run / self._ext_benchmark_run_dir.name
666667
)
668+
dot_path = self._int_pbench_run / ".path"
667669
try:
668-
dot_path = (self._int_pbench_run / ".path").read_text().strip()
670+
dot_path_contents = dot_path.read_text().strip()
669671
except Exception as exc:
670672
# Failed to read ".path" contents, give up.
671673
raise ToolDataSinkError(
@@ -674,11 +676,11 @@ def __init__(self, ext_benchmark_run_dir, int_pbench_run):
674676
f".path' not found, '{exc}').",
675677
)
676678
else:
677-
if dot_path != str(self._ext_pbench_run):
679+
if dot_path_contents != str(self._ext_pbench_run):
678680
raise ToolDataSinkError(
679681
f"Run directory parameter, '{ext_benchmark_run_dir}',"
680682
" must be an existing directory (.path contents"
681-
f" mismatch, .path='{dot_path}' !="
683+
f" mismatch, .path='{dot_path_contents}' !="
682684
f" '{self._ext_pbench_run}').",
683685
)
684686
else:

0 commit comments

Comments
 (0)