opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Adjust API tests to copying HDAs when creating collection"

Browse Source 
This reverts commit f120390a63700ff0ec6c09185aad26b91ad8f842.
This commit is contained in:
mvdbeek
2018-08-26 22:13:50 +02:00
parent 9409322a73
commit b13cce0a13
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/api/test_history_contents.py
+3 -3
View File
@@ -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"])
test/api/test_tools.py
+1 -1
View File
@@ -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")
test/api/test_workflows.py
+3 -3
View File
@@ -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'