From b13cce0a1340a5f9b7a77ab7eda1ceb0930ed161 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Thu, 9 Aug 2018 16:49:17 +0200 Subject: [PATCH] Revert "Adjust API tests to copying HDAs when creating collection" This reverts commit f120390a63700ff0ec6c09185aad26b91ad8f842. --- test/api/test_history_contents.py | 6 +++--- test/api/test_tools.py | 2 +- test/api/test_workflows.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/api/test_history_contents.py b/test/api/test_history_contents.py index 7c6bc7a6505..2fe9a2d1405 100644 --- a/test/api/test_history_contents.py +++ b/test/api/test_history_contents.py @@ -302,9 +302,9 @@ class HistoryContentsApiTestCase(api.ApiTestCase, TestsDatasets): # Test filtering types with index. assert pre_collection_count == 0 assert post_collection_count == 1 - assert post_combined_count == pre_dataset_count * 2 + 1 - assert post_combined_count == pre_combined_count * 2 + 1 - assert pre_dataset_count * 2 == post_dataset_count + assert post_combined_count == pre_dataset_count + 1 + assert post_combined_count == pre_combined_count + 1 + assert pre_dataset_count == post_dataset_count # Test show dataset colleciton. collection_url = "histories/%s/contents/dataset_collections/%s" % (self.history_id, dataset_collection["id"]) diff --git a/test/api/test_tools.py b/test/api/test_tools.py index f6ed5548ee8..a4710a61f4f 100644 --- a/test/api/test_tools.py +++ b/test/api/test_tools.py @@ -1606,7 +1606,7 @@ class ToolsTestCase(api.ApiTestCase): "header": {'batch': True, 'values': [dict(src="hdca", id=hdca_id)]} } self._run("collection_type_source", history_id, inputs, assert_ok=True, wait_for_job=True) - collection_details = self.dataset_populator.get_history_collection_details(history_id, hid=6) + collection_details = self.dataset_populator.get_history_collection_details(history_id, hid=4) assert collection_details['elements'][0]['object']['elements'][0]['element_type'] == 'hda' @skip_without_tool("multi_data_param") diff --git a/test/api/test_workflows.py b/test/api/test_workflows.py index 86d6074fe9b..817161eb7a2 100644 --- a/test/api/test_workflows.py +++ b/test/api/test_workflows.py @@ -1726,8 +1726,8 @@ steps: $link: first_cat#out_file1 """) DELETED = 0 - PAUSED_1 = 4 - PAUSED_2 = 6 + PAUSED_1 = 3 + PAUSED_2 = 5 hdca1 = self.dataset_collection_populator.create_list_in_history(history_id, contents=[("sample1-1", "1 2 3")]).json() self.dataset_populator.wait_for_history(history_id, assert_ok=True) @@ -1744,7 +1744,7 @@ steps: # in which case we can disable this test. self.dataset_populator.wait_for_history_jobs(history_id, assert_ok=False) contents = self.__history_contents(history_id) - assert contents[1]['deleted'] + assert contents[DELETED]['deleted'] assert contents[PAUSED_1]['state'] == 'paused' assert contents[PAUSED_2]['state'] == 'paused'