1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/4fce5cfe8be5/ Changeset: 4fce5cfe8be5 User: inithello Date: 2013-05-01 16:23:13 Summary: Update repository metadata generation to provide the file path for tool functional test output files. Update script that checks for tool functional tests and test data to use the updated metadata structure. Affected #: 2 files diff -r cd6c9cc0079ce10685c04d003e735d6054a4a8c6 -r 4fce5cfe8be5724f27a1a909dac135c3f010fe30 lib/tool_shed/scripts/check_repositories_for_functional_tests.py --- a/lib/tool_shed/scripts/check_repositories_for_functional_tests.py +++ b/lib/tool_shed/scripts/check_repositories_for_functional_tests.py @@ -387,16 +387,9 @@ missing_test_files = [] required_test_files = [] for test_dict in test_definition: - for input_file in test_dict[ 'required_files' ]: - if input_file not in required_test_files: - required_test_files.append( input_file ) - for output in test_dict[ 'outputs' ]: - fieldname, filename = output - # In rare cases, the filename may be None. If that is the case, skip that output definition. - if filename is None: - continue - if filename not in required_test_files: - required_test_files.append( filename ) + for required_file in test_dict[ 'required_files' ]: + if required_file not in required_test_files: + required_test_files.append( required_file ) # Make sure each specified file actually does exist in the test data path of the cloned repository. for required_file in required_test_files: required_file_full_path = os.path.join( test_data_path, required_file ) diff -r cd6c9cc0079ce10685c04d003e735d6054a4a8c6 -r 4fce5cfe8be5724f27a1a909dac135c3f010fe30 lib/tool_shed/util/metadata_util.py --- a/lib/tool_shed/util/metadata_util.py +++ b/lib/tool_shed/util/metadata_util.py @@ -825,6 +825,8 @@ for output in ttb.outputs: name, file_name, extra = output outputs.append( ( name, suc.strip_path( file_name ) if file_name else None ) ) + if file_name not in required_files and file_name is not None: + required_files.append( file_name ) test_dict = dict( name=ttb.name, required_files=required_files, inputs=inputs, 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.