Merge pull request #6954 from jmchilton/workflow_tests_2

Small API Workflow Test Improvements.
galaxyproject · Nov 5, 2018 · c3dc239 · c3dc239
2 parents c1e4b01 + 06aea92
commit c3dc239
Showing 1 changed file with 30 additions and 19 deletions.
diff --git a/test/api/test_workflows.py b/test/api/test_workflows.py
@@ -896,32 +896,26 @@ def test_workflow_metadata_validation_0(self):
 
     def test_run_subworkflow_simple(self):
         with self.dataset_populator.test_history() as history_id:
-            workflow_run_description = """%s
-
-test_data:
-  outer_input:
-    value: 1.bed
-    type: File
-""" % WORKFLOW_NESTED_SIMPLE
-            self._run_jobs(workflow_run_description, history_id=history_id)
+            self._run_jobs(WORKFLOW_NESTED_SIMPLE, test_data="""
+outer_input:
+  value: 1.bed
+  type: File
+""", history_id=history_id)
 
             content = self.dataset_populator.get_history_dataset_content(history_id)
             self.assertEqual("chrX\t152691446\t152691471\tCCDS14735.1_cds_0_0_chrX_152691447_f\t0\t+\nchrX\t152691446\t152691471\tCCDS14735.1_cds_0_0_chrX_152691447_f\t0\t+\n", content)
 
     @skip_without_tool("random_lines1")
     def test_run_subworkflow_runtime_parameters(self):
         with self.dataset_populator.test_history() as history_id:
-            workflow_run_description = """%s
-
-test_data:
-  step_parameters:
-    '1':
-      '1|num_lines': 2
-  outer_input:
-    value: 1.bed
-    type: File
-""" % WORKFLOW_NESTED_RUNTIME_PARAMETER
-            self._run_jobs(workflow_run_description, history_id=history_id)
+            self._run_jobs(WORKFLOW_NESTED_RUNTIME_PARAMETER, test_data="""
+step_parameters:
+  '1':
+    '1|num_lines': 2
+outer_input:
+  value: 1.bed
+  type: File
+""", history_id=history_id)
 
             content = self.dataset_populator.get_history_dataset_content(history_id)
             assert len([x for x in content.split("\n") if x]) == 2
@@ -2834,6 +2828,23 @@ def test_run_replace_params_nested(self):
         self.dataset_populator.wait_for_history(history_id, assert_ok=True)
         self.assertEqual("2\n", self.dataset_populator.get_history_dataset_content(history_id))
 
+    @skip_without_tool("random_lines1")
+    def test_run_replace_params_nested_normalized(self):
+        workflow_request, history_id, steps = self._setup_random_x2_workflow_steps("test_for_replace_step_normalized_params_nested")
+        parameters = {
+            "num_lines": 1,
+            "seed_source|seed_source_selector": "set_seed",
+            "seed_source|seed": "moo",
+        }
+        params = dumps({str(steps[0]["id"]): parameters,
+                        str(steps[1]["id"]): parameters})
+        workflow_request["parameters"] = params
+        workflow_request["parameters_normalized"] = False
+        run_workflow_response = self._post("workflows", data=workflow_request)
+        self._assert_status_code_is(run_workflow_response, 200)
+        self.dataset_populator.wait_for_history(history_id, assert_ok=True)
+        self.assertEqual("2\n", self.dataset_populator.get_history_dataset_content(history_id))
+
     def test_pja_import_export(self):
         workflow = self.workflow_populator.load_workflow(name="test_for_pja_import", add_pja=True)
         uploaded_workflow_id = self.workflow_populator.create_workflow(workflow)