Rebase into workflow test framework.

jmchilton · Jul 13, 2024 · b23919d · b23919d
1 parent 40fd996
commit b23919d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/lib/galaxy/tool_util/verify/__init__.py b/lib/galaxy/tool_util/verify/__init__.py
@@ -603,7 +603,7 @@ def verify_file_path_against_dict(
 ) -> None:
     with open(path, "rb") as f:
         output_content = f.read()
-    item_label = "Output with path %s" % path
+    item_label = f"Output with path {path}"
     verify_file_contents_against_dict(
         get_filename, get_location, item_label, output_content, test_properties, test_data_target_dir
     )

diff --git a/lib/galaxy_test/workflow/tests.py b/lib/galaxy_test/workflow/tests.py
@@ -9,10 +9,7 @@
 from gxformat2.yaml import ordered_load
 
 from galaxy.tool_util.parser.interface import TestCollectionOutputDef
-from galaxy.tool_util.verify import (
-    verify,
-    verify_file_contents_against_dict,
-)
+from galaxy.tool_util.verify import verify_file_contents_against_dict
 from galaxy.tool_util.verify.interactor import (
     compare_expected_metadata_to_api_response,
     get_metadata_to_test,
@@ -62,6 +59,7 @@ def test_workflow(self, workflow_path: Path, test_job):
             run_summary = self.workflow_populator.run_workflow(
                 yaml_content,
                 test_data=test_job["job"],
+                history_id=history_id,
             )
             self._verify(run_summary, test_job["outputs"])