New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move wait_for_dataset_collection to populators #4658

Merged
merged 1 commit into from Sep 21, 2017

Conversation

Projects
None yet
4 participants
@mvdbeek
Member

mvdbeek commented Sep 20, 2017

This will allow us us to reuse this in other tests I'm working on (enhancing job_search to work with collection in/out).

@@ -113,11 +111,10 @@ def test_list_download(self):
def test_pair_download(self):
dataset_collection = self.dataset_collection_populator.create_pair_in_history(self.history_id).json()
self.dataset_collection_populator.wait_for_dataset_collection(dataset_collection, assert_ok=True)
returned_dce = dataset_collection["elements"]
assert len(returned_dce) == 2, dataset_collection
returned_datasets = [dce["object"] for dce in returned_dce]

This comment has been minimized.

@nsoranzo

nsoranzo Sep 20, 2017

Member

test/api/test_dataset_collections.py:117:9: F841 local variable 'returned_datasets' is assigned to but never used

This comment has been minimized.

@mvdbeek

mvdbeek Sep 20, 2017

Member

Thanks @nsoranzo, I rebased with that change.

returned_datasets = [dce["object"] for dce in returned_dce]
for element in returned_datasets:
self.dataset_populator.wait_for_dataset(history_id=self.history_id, dataset_id=element['id'], assert_ok=True)
assert len(dataset_collection["elements"]) == 3, dataset_collection

This comment has been minimized.

@nsoranzo

nsoranzo Sep 20, 2017

Member

You can probably revert the change to this line back to:

assert len(returned_dce) == 3, dataset_collection

for consistency with the other tests.

This comment has been minimized.

@mvdbeek

mvdbeek Sep 20, 2017

Member

Right, will do!

@mvdbeek mvdbeek changed the title from Move wait for dataset_collection to populators.py to Move wait_for_dataset_collection to populators Sep 20, 2017

@dannon dannon merged commit 71c5398 into galaxyproject:dev Sep 21, 2017

6 checks passed

api test Build finished. 292 tests run, 4 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 161 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 46 tests run, 0 skipped, 0 failed.
Details
lgtm analysis: JavaScript No alert changes
Details
toolshed test Build finished. 579 tests run, 0 skipped, 0 failed.
Details

@mvdbeek mvdbeek deleted the mvdbeek:wait_for_collectino_test branch Aug 16, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment