1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/6a633b37c4c4/ Changeset: 6a633b37c4c4 User: greg Date: 2014-02-28 14:52:52 Summary: Minor fixes for installing tool dependencies and counting repositories processed during the tool shed's install and test runs. Affected #: 3 files diff -r 95517f976cca49f984b89c9fdd5b9208b1a11fcb -r 6a633b37c4c47bba640d05fef72fd73f41ae5086 lib/tool_shed/galaxy_install/tool_dependencies/td_common_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/td_common_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/td_common_util.py @@ -15,7 +15,7 @@ log = logging.getLogger( __name__ ) # Set no activity timeout to 20 minutes. -NO_OUTPUT_TIMEOUT = 1200 +NO_OUTPUT_TIMEOUT = 1200.0 class CompressedFile( object ): @@ -473,7 +473,7 @@ ( str( download_url ), NO_OUTPUT_TIMEOUT ) raise Exception( err_msg ) except Exception, e: - err_msg = err_msg = 'Error downloading from URL %s: %s' % ( str( download_url ), NO_OUTPUT_TIMEOUT ) + err_msg = err_msg = 'Error downloading from URL\n%s:\n%s' % ( str( download_url ), str( e ) ) raise Exception( err_msg ) finally: if src: diff -r 95517f976cca49f984b89c9fdd5b9208b1a11fcb -r 6a633b37c4c47bba640d05fef72fd73f41ae5086 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 @@ -181,6 +181,7 @@ changeset_revision = str( repository_dict.get( 'changeset_revision', '' ) ) print "Processing revision %s of repository %s owned by %s..." % ( changeset_revision, name, owner ) repository_identifier_tup = ( name, owner, changeset_revision ) + install_and_test_statistics_dict[ 'total_repositories_processed' ] += 1 # Retrieve the stored list of tool_test_results_dicts. tool_test_results_dicts, error_message = \ install_and_test_base_util.get_tool_test_results_dicts( install_and_test_base_util.galaxy_tool_shed_url, @@ -215,7 +216,6 @@ start_time = time.time() tool_test_results_dict = install_and_test_base_util.initialize_tool_tests_results_dict( app, tool_test_results_dict ) 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: remove_tests( app, repository ) # The repository installation failed. diff -r 95517f976cca49f984b89c9fdd5b9208b1a11fcb -r 6a633b37c4c47bba640d05fef72fd73f41ae5086 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 @@ -112,6 +112,7 @@ changeset_revision = str( repository_dict.get( 'changeset_revision', '' ) ) print "Processing revision %s of repository %s owned by %s..." % ( changeset_revision, name, owner ) repository_identifier_tup = ( name, owner, changeset_revision ) + install_and_test_statistics_dict[ 'total_repositories_processed' ] += 1 # Retrieve the stored list of tool_test_results_dicts. tool_test_results_dicts, error_message = \ install_and_test_base_util.get_tool_test_results_dicts( install_and_test_base_util.galaxy_tool_shed_url, @@ -146,7 +147,6 @@ start_time = time.time() tool_test_results_dict = install_and_test_base_util.initialize_tool_tests_results_dict( app, tool_test_results_dict ) 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: # The repository installation failed. print 'Installation failed for revision %s of repository %s owned by %s.' % ( changeset_revision, name, owner ) 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.