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

Rearrange verify method to make duplication more obvious.

Browse Source
This commit is contained in:
John Chilton
2014-12-01 21:18:56 -05:00
parent acbba060f8
commit 421ee93140
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/base/interactor.py
+1 -2
View File
@@ -64,6 +64,7 @@ class GalaxyInteractorApi( object ):
fetcher = self.__dataset_fetcher( history_id )
## TODO: Twill version verifys dataset is 'ok' in here.
self.twill_test_case.verify_hid( outfile, hda_id=hid, attributes=attributes, dataset_fetcher=fetcher, shed_tool_id=shed_tool_id )
self._verify_metadata( history_id, hid, attributes )
primary_datasets = attributes.get( 'primary_datasets', {} )
if primary_datasets:
@@ -86,8 +87,6 @@ class GalaxyInteractorApi( object ):
self.twill_test_case.verify_hid( primary_outfile, hda_id=primary_hda_id, attributes=primary_attributes, dataset_fetcher=fetcher, shed_tool_id=shed_tool_id )
self._verify_metadata( history_id, primary_hda_id, primary_attributes )
self._verify_metadata( history_id, hid, attributes )
def _verify_metadata( self, history_id, hid, attributes ):
metadata = attributes.get( 'metadata', {} ).copy()
for key, value in metadata.copy().iteritems():