2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a17810e4f3ce/ Changeset: a17810e4f3ce User: jmchilton Date: 2014-03-14 16:12:41 Summary: Check ftype attribute (if defined) on test output datasets. Only works for newer API driven tests. Affected #: 2 files diff -r 3fb927653301a0c06a0bf94f2b6bd71b3595ec0d -r a17810e4f3ce1fce18565b33c1306885dfb3ef38 test/base/interactor.py --- a/test/base/interactor.py +++ b/test/base/interactor.py @@ -45,13 +45,20 @@ 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 ) - metadata = attributes.get( 'metadata', {} ) + metadata = attributes.get( 'metadata', {} ).copy() + for key, value in metadata.copy().iteritems(): + new_key = "metadata_%s" % key + metadata[ new_key ] = metadata[ key ] + del metadata[ key ] + expected_file_type = attributes.get( 'ftype', None ) + if expected_file_type: + metadata[ "file_ext" ] = expected_file_type + if metadata: dataset = self._get( "histories/%s/contents/%s" % ( history_id, hid ) ).json() for key, value in metadata.iteritems(): - dataset_key = "metadata_%s" % key try: - dataset_value = dataset.get( dataset_key, None ) + dataset_value = dataset.get( key, None ) if dataset_value != value: msg = "Dataset metadata verification for [%s] failed, expected [%s] but found [%s]." msg_params = ( key, value, dataset_value ) diff -r 3fb927653301a0c06a0bf94f2b6bd71b3595ec0d -r a17810e4f3ce1fce18565b33c1306885dfb3ef38 test/functional/tools/metadata.xml --- a/test/functional/tools/metadata.xml +++ b/test/functional/tools/metadata.xml @@ -16,7 +16,7 @@ <metadata name="base_name" value="Example Metadata" /></param><!-- This ouptut tests setting input metadata above --> - <output name="output_of_input_metadata"> + <output name="output_of_input_metadata" ftype="txt"><assert_contents><has_line line="Example Metadata" /></assert_contents> https://bitbucket.org/galaxy/galaxy-central/commits/327583f6b058/ Changeset: 327583f6b058 User: jmchilton Date: 2014-03-18 18:42:23 Summary: Merged in jmchilton/galaxy-central-fork-1 (pull request #347) Check ftype attribute (if defined) on test output datasets. Affected #: 2 files diff -r 0a9263af45ec678bea82a6d128f49cf5372d370d -r 327583f6b0581c2bdf22b933b2659298af2ed699 test/base/interactor.py --- a/test/base/interactor.py +++ b/test/base/interactor.py @@ -45,13 +45,20 @@ 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 ) - metadata = attributes.get( 'metadata', {} ) + metadata = attributes.get( 'metadata', {} ).copy() + for key, value in metadata.copy().iteritems(): + new_key = "metadata_%s" % key + metadata[ new_key ] = metadata[ key ] + del metadata[ key ] + expected_file_type = attributes.get( 'ftype', None ) + if expected_file_type: + metadata[ "file_ext" ] = expected_file_type + if metadata: dataset = self._get( "histories/%s/contents/%s" % ( history_id, hid ) ).json() for key, value in metadata.iteritems(): - dataset_key = "metadata_%s" % key try: - dataset_value = dataset.get( dataset_key, None ) + dataset_value = dataset.get( key, None ) if dataset_value != value: msg = "Dataset metadata verification for [%s] failed, expected [%s] but found [%s]." msg_params = ( key, value, dataset_value ) diff -r 0a9263af45ec678bea82a6d128f49cf5372d370d -r 327583f6b0581c2bdf22b933b2659298af2ed699 test/functional/tools/metadata.xml --- a/test/functional/tools/metadata.xml +++ b/test/functional/tools/metadata.xml @@ -16,7 +16,7 @@ <metadata name="base_name" value="Example Metadata" /></param><!-- This ouptut tests setting input metadata above --> - <output name="output_of_input_metadata"> + <output name="output_of_input_metadata" ftype="txt"><assert_contents><has_line line="Example Metadata" /></assert_contents> Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.