commit/galaxy-central: greg: Don't uninstall repositories when testing tool dependency definitions in the tool shed's install and test process.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/67fe4b091f0a/ Changeset: 67fe4b091f0a User: greg Date: 2013-12-19 14:47:20 Summary: Don't uninstall repositories when testing tool dependency definitions in the tool shed's install and test process. Affected #: 1 file diff -r 5bfa1d47b3999a695a04294adb13da0b5b3ec041 -r 67fe4b091f0ad66d68d06a36b8fb645aa445d032 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 @@ -201,28 +201,18 @@ else: log.debug( 'Installation succeeded for revision %s of repository %s owned by %s.' % \ ( changeset_revision, name, owner ) ) - # Keep statistics for this repository's tool dependencies that resulted in installation errors. - for missing_tool_dependency in repository.missing_tool_dependencies: - name = str( missing_tool_dependency.name ) - type = str( missing_tool_dependency.type ) - version = str( missing_tool_dependency.version ) - error_message = unicodify( missing_tool_dependency.error_message ) - missing_tool_dependency_info_dict = dict( type=type, - name=name, - version=version, - error_message=error_message ) - install_and_test_statistics_dict[ 'tool_dependencies_with_installation_error' ].append( missing_tool_dependency_info_dict ) - # Attempt to uninstall this repository and all of its dependencies if its repository dependencies or - # tool dependencies resulted in an installation error. - missing_tool_dependencies = install_and_test_base_util.get_missing_tool_dependencies( repository ) - if missing_tool_dependencies or repository.missing_repository_dependencies: - install_and_test_base_util.handle_missing_dependencies( app=app, - repository=repository, - missing_tool_dependencies=missing_tool_dependencies, - repository_dict=repository_dict, - tool_test_results_dicts=tool_test_results_dicts, - tool_test_results_dict=tool_test_results_dict, - can_update_tool_shed=can_update_tool_shed ) + if repository.missing_tool_dependencies: + # Keep statistics for this repository's tool dependencies that resulted in installation errors. + for missing_tool_dependency in repository.missing_tool_dependencies: + name = str( missing_tool_dependency.name ) + type = str( missing_tool_dependency.type ) + version = str( missing_tool_dependency.version ) + error_message = unicodify( missing_tool_dependency.error_message ) + missing_tool_dependency_info_dict = dict( type=type, + name=name, + version=version, + error_message=error_message ) + install_and_test_statistics_dict[ 'tool_dependencies_with_installation_error' ].append( missing_tool_dependency_info_dict ) else: # This repository and all of its dependencies were successfully installed. install_and_test_statistics_dict[ 'successful_installations' ].append( repository_identifier_dict ) 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.
participants (1)
-
commits-noreply@bitbucket.org