commit/galaxy-central: greg: Fix for handling missing dependencies in the tool shed's install and test framework.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/5bfa1d47b399/ Changeset: 5bfa1d47b399 User: greg Date: 2013-12-19 02:32:15 Summary: Fix for handling missing dependencies in the tool shed's install and test framework. Affected #: 2 files diff -r 4077a5a1f801a772acd01d19c9695329a42c5958 -r 5bfa1d47b3999a695a04294adb13da0b5b3ec041 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 @@ -286,16 +286,15 @@ if 'missing_test_components' not in tool_test_results_dict: tool_test_results_dict[ 'missing_test_components' ] = [] missing_tool_dependencies = install_and_test_base_util.get_missing_tool_dependencies( repository ) - if missing_tool_dependencies or repository.missing_repository_dependencies: + if missing_tool_dependencies or repository.missing_repository_dependencies: install_and_test_statistics_dict = \ - install_and_test_base_util.handle_missing_dependencies( app, - repository, - missing_tool_dependencies, - repository_dict, - tool_test_results_dicts, - tool_test_results_dict, - install_and_test_statistics_dict, - can_update_tool_shed ) + 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 ) # Set the test_toolbox.toolbox module-level variable to the new app.toolbox. test_toolbox.toolbox = app.toolbox else: diff -r 4077a5a1f801a772acd01d19c9695329a42c5958 -r 5bfa1d47b3999a695a04294adb13da0b5b3ec041 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 @@ -216,14 +216,13 @@ # 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, - repository, - missing_tool_dependencies, - repository_dict, - tool_test_results_dicts, - tool_test_results_dict, - install_and_test_statistics_dict, - can_update_tool_shed ) + 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 ) 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