1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/b83064c6c323/ Changeset: b83064c6c323 User: greg Date: 2013-12-21 13:49:59 Summary: Fix for testing tool dependency definitions with the tool shed's install and test framework. Affected #: 2 files
diff -r 38b88dceb82e092f79c2f4b6aff745d11f77dac4 -r b83064c6c323217a6072e869afafec19ce965b0f test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py --- a/test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py +++ b/test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py @@ -197,7 +197,6 @@ ( changeset_revision, name, owner ) ) else: tool_test_results_dict = install_and_test_base_util.initialize_tool_tests_results_dict( app, tool_test_results_dict ) - # Proceed with installing repositories and testing contained tools. repository, error_message = install_and_test_base_util.install_repository( app, repository_dict ) install_and_test_statistics_dict[ 'total_repositories_processed' ] += 1 if error_message:
diff -r 38b88dceb82e092f79c2f4b6aff745d11f77dac4 -r b83064c6c323217a6072e869afafec19ce965b0f test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py --- a/test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py +++ b/test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py @@ -120,7 +120,7 @@ owner, changeset_revision, encoded_repository_metadata_id ) - if this_repository_is_in_the_exclude_list or requires_excluded: + if is_excluded: # If this repository is being skipped, register the reason. tool_test_results_dict[ 'not_tested' ] = dict( reason=reason ) params = dict( do_not_test=False ) @@ -142,8 +142,7 @@ log.debug( 'Installation failed for revision %s of repository %s owned by %s.' % ( changeset_revision, name, owner ) ) install_and_test_statistics_dict[ 'repositories_with_installation_error' ].append( repository_identifier_dict ) tool_test_results_dict[ 'installation_errors' ][ 'current_repository' ] = error_message - params = dict( test_install_error=True, - do_not_test=False ) + params = dict( test_install_error=True ) # TODO: do something useful with response_dict response_dict = install_and_test_base_util.register_test_result( install_and_test_base_util.galaxy_tool_shed_url, tool_test_results_dicts, @@ -153,6 +152,8 @@ can_update_tool_shed ) else: # The repository was successfully installed. + log.debug( 'Installation succeeded for revision %s of repository %s owned by %s.' % \ + ( changeset_revision, name, owner ) ) params, install_and_test_statistics_dict, tool_test_results_dict = \ install_and_test_base_util.register_installed_and_missing_dependencies( app, repository,
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.