2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/dfcae0da21f7/ Changeset: dfcae0da21f7 Branch: stable User: davebgx Date: 2014-02-21 19:16:48 Summary: Fix for certain cases where the tool test results' installation_errors dict would be populated with incorrect values. Affected #: 3 files diff -r d20888b2d96c8a021871a4252b5cc74e09578f07 -r dfcae0da21f7c3885f92c478bc0a44ba75f5f8b6 test/install_and_test_tool_shed_repositories/base/util.py --- a/test/install_and_test_tool_shed_repositories/base/util.py +++ b/test/install_and_test_tool_shed_repositories/base/util.py @@ -890,7 +890,7 @@ ( changeset_revision, name, owner ) print 'due to the following error getting tool_test_results:\n%s' % str( error_message ) else: - # The assumption is that the Tool SHed's install and test framework is executed no more than once per 24 hour + # The assumption is that the Tool Shed's install and test framework is executed no more than once per 24 hour # period, so check the required repository's time_last_tested value to see if its tool_test_results column # has been updated within the past 20 hours to allow for differing test run times (some may be slower than # others). The RepositoryMetadata class's to_dict() method returns the value of time_last_tested in @@ -965,7 +965,12 @@ can_update_tool_shed ) else: # The required repository's installation failed. - tool_test_results_dict[ 'installation_errors' ][ 'current_repository' ] = str( required_repository.error_message ) + required_repository_installation_error_dict = dict( tool_shed=galaxy_tool_shed_url, + name=name, + owner=owner, + changeset_revision=changeset_revision, + error_message=required_repository.error_message ) + tool_test_results_dict[ 'installation_errors' ][ 'repository_dependencies' ].append( required_repository_installation_error_dict ) params = dict( test_install_error=True, do_not_test=False ) save_test_results_for_changeset_revision( galaxy_tool_shed_url, diff -r d20888b2d96c8a021871a4252b5cc74e09578f07 -r dfcae0da21f7c3885f92c478bc0a44ba75f5f8b6 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 @@ -217,7 +217,12 @@ install_and_test_statistics_dict.get( 'repositories_with_installation_error', [] ) if repository_identifier_tup not in processed_repositories_with_installation_error: install_and_test_statistics_dict[ 'repositories_with_installation_error' ].append( repository_identifier_tup ) - tool_test_results_dict[ 'installation_errors' ][ 'current_repository' ] = error_message + current_repository_installation_error_dict = dict( tool_shed=install_and_test_base_util.galaxy_tool_shed_url, + name=name, + owner=owner, + changeset_revision=changeset_revision, + error_message=error_message ) + tool_test_results_dict[ 'installation_errors' ][ 'current_repository' ].append( current_repository_installation_error_dict ) params = dict( test_install_error=True, do_not_test=False ) install_and_test_base_util.save_test_results_for_changeset_revision( install_and_test_base_util.galaxy_tool_shed_url, diff -r d20888b2d96c8a021871a4252b5cc74e09578f07 -r dfcae0da21f7c3885f92c478bc0a44ba75f5f8b6 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 @@ -147,7 +147,12 @@ install_and_test_statistics_dict.get( 'repositories_with_installation_error', [] ) if repository_identifier_tup not in processed_repositories_with_installation_error: install_and_test_statistics_dict[ 'repositories_with_installation_error' ].append( repository_identifier_tup ) - tool_test_results_dict[ 'installation_errors' ][ 'current_repository' ] = error_message + current_repository_installation_error_dict = dict( tool_shed=install_and_test_base_util.galaxy_tool_shed_url, + name=name, + owner=owner, + changeset_revision=changeset_revision, + error_message=error_message ) + tool_test_results_dict[ 'installation_errors' ][ 'current_repository' ].append( current_repository_installation_error_dict ) params = dict( test_install_error=True, do_not_test=False ) install_and_test_base_util.save_test_results_for_changeset_revision( install_and_test_base_util.galaxy_tool_shed_url, https://bitbucket.org/galaxy/galaxy-central/commits/4a3c5d044d5a/ Changeset: 4a3c5d044d5a User: davebgx Date: 2014-02-21 19:17:21 Summary: Merge bugfix from stable. Affected #: 3 files diff -r 6f9d716d00099f557f856f1b909ec73706bf9c99 -r 4a3c5d044d5ae7236a03942eabd048ec7a9c9d70 test/install_and_test_tool_shed_repositories/base/util.py --- a/test/install_and_test_tool_shed_repositories/base/util.py +++ b/test/install_and_test_tool_shed_repositories/base/util.py @@ -890,7 +890,7 @@ ( changeset_revision, name, owner ) print 'due to the following error getting tool_test_results:\n%s' % str( error_message ) else: - # The assumption is that the Tool SHed's install and test framework is executed no more than once per 24 hour + # The assumption is that the Tool Shed's install and test framework is executed no more than once per 24 hour # period, so check the required repository's time_last_tested value to see if its tool_test_results column # has been updated within the past 20 hours to allow for differing test run times (some may be slower than # others). The RepositoryMetadata class's to_dict() method returns the value of time_last_tested in @@ -965,7 +965,12 @@ can_update_tool_shed ) else: # The required repository's installation failed. - tool_test_results_dict[ 'installation_errors' ][ 'current_repository' ] = str( required_repository.error_message ) + required_repository_installation_error_dict = dict( tool_shed=galaxy_tool_shed_url, + name=name, + owner=owner, + changeset_revision=changeset_revision, + error_message=required_repository.error_message ) + tool_test_results_dict[ 'installation_errors' ][ 'repository_dependencies' ].append( required_repository_installation_error_dict ) params = dict( test_install_error=True, do_not_test=False ) save_test_results_for_changeset_revision( galaxy_tool_shed_url, diff -r 6f9d716d00099f557f856f1b909ec73706bf9c99 -r 4a3c5d044d5ae7236a03942eabd048ec7a9c9d70 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 @@ -218,7 +218,12 @@ install_and_test_statistics_dict.get( 'repositories_with_installation_error', [] ) if repository_identifier_tup not in processed_repositories_with_installation_error: install_and_test_statistics_dict[ 'repositories_with_installation_error' ].append( repository_identifier_tup ) - tool_test_results_dict[ 'installation_errors' ][ 'current_repository' ] = error_message + current_repository_installation_error_dict = dict( tool_shed=install_and_test_base_util.galaxy_tool_shed_url, + name=name, + owner=owner, + changeset_revision=changeset_revision, + error_message=error_message ) + tool_test_results_dict[ 'installation_errors' ][ 'current_repository' ].append( current_repository_installation_error_dict ) params = dict( test_install_error=True, do_not_test=False ) install_and_test_base_util.save_test_results_for_changeset_revision( install_and_test_base_util.galaxy_tool_shed_url, diff -r 6f9d716d00099f557f856f1b909ec73706bf9c99 -r 4a3c5d044d5ae7236a03942eabd048ec7a9c9d70 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 @@ -148,7 +148,12 @@ install_and_test_statistics_dict.get( 'repositories_with_installation_error', [] ) if repository_identifier_tup not in processed_repositories_with_installation_error: install_and_test_statistics_dict[ 'repositories_with_installation_error' ].append( repository_identifier_tup ) - tool_test_results_dict[ 'installation_errors' ][ 'current_repository' ] = error_message + current_repository_installation_error_dict = dict( tool_shed=install_and_test_base_util.galaxy_tool_shed_url, + name=name, + owner=owner, + changeset_revision=changeset_revision, + error_message=error_message ) + tool_test_results_dict[ 'installation_errors' ][ 'current_repository' ].append( current_repository_installation_error_dict ) params = dict( test_install_error=True, do_not_test=False ) install_and_test_base_util.save_test_results_for_changeset_revision( install_and_test_base_util.galaxy_tool_shed_url, 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.