Skip to content

Commit 1694ae9

Browse files
committed
Merge branch 'taskvine_logger' into testing
2 parents d54656a + 1dd4f4c commit 1694ae9

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

tests/translators_loggers/test_translators_loggers.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def _additional_setup_taskvine(container):
6565
cmd=["bash", "-c", "source ~/conda/etc/profile.d/conda.sh && conda activate && vine_worker localhost 9123"],
6666
detach=True, stdout=True, stderr=True)
6767
# Note that exit_code will always be None because of detach=True. So hopefully this works.
68-
# TODO?: check that the vine_worker is running....
68+
# TODO?: check that the vine_worker is running (so as to abort early)
6969

7070
def _additional_setup_pegasus(container):
7171
# Start Condor
@@ -231,7 +231,11 @@ class TestTranslators:
231231
"parsl",
232232
"nextflow",
233233
"airflow",
234+
<<<<<<< HEAD
234235
"bash",
236+
=======
237+
"bash",
238+
>>>>>>> taskvine_logger
235239
"taskvine",
236240
"cwl",
237241
"pegasus",

wfcommons/wfinstances/logs/taskvine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ def _construct_task_input_output_files(self) -> None:
223223
if "file-task" in line: # Ignoring what I think are taskvine internal/specific things
224224
continue
225225
line = line[:-1]
226-
print(f"LINE: {line}")
226+
# print(f"LINE: {line}")
227227
[source, ignore, destination] = line.split()
228228
# Remove quotes
229229
source = source [1:-1]

0 commit comments

Comments
 (0)