1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/2f1c11166330/ Changeset: 2f1c11166330 User: greg Date: 2014-01-07 15:23:01 Summary: Fix for the tool shed's install and test framework. Affected #: 1 file
diff -r 22fb2b5a46ac2fd1a97b6dd50124b29962e2103b -r 2f1c111663308e0d8f081c2b443aa39808641046 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 @@ -207,6 +207,23 @@ def shutdown( self ): pass
+def clean_tool_shed_url( base_url ): + """Eliminate the protocol from the received base_url and return the possibly altered url.""" + # The tool_shed value stored in the tool_shed_repository record does not include the protocol, but does + # include the port if one exists. + if base_url: + if base_url.find( '://' ) > -1: + try: + protocol, base = base_url.split( '://' ) + except ValueError, e: + # The received base_url must be an invalid url. + log.debug( "Returning unchanged invalid base_url from clean_tool_shed_url: %s" % str( base_url ) ) + return base_url + return base.rstrip( '/' ) + return base_url.rstrip( '/' ) + log.debug( "Returning base_url from clean_tool_shed_url: %s" % str( base_url ) ) + return base_url + def display_repositories_by_owner( repository_dicts ): # Group summary display by repository owner. repository_dicts_by_owner = {} @@ -877,9 +894,10 @@ # Make sure all expected entries are available in the tool_test_results_dict. tool_test_results_dict = initialize_tool_tests_results_dict( app, tool_test_results_dict ) # Get the installed repository record from the Galaxy database. + cleaned_tool_shed_url = clean_tool_shed_url( galaxy_tool_shed_url ) required_repository = \ suc.get_tool_shed_repository_by_shed_name_owner_changeset_revision( app, - galaxy_tool_shed_url, + cleaned_tool_shed_url, name, owner, changeset_revision ) @@ -919,8 +937,11 @@ log.debug('\n=============================================================\n' ) else: log.debug( 'Cannot retrieve revision %s of required repository %s owned by %s from the database ' % \ - ( changeset_revision, name, owner, str( response_dict ) ) ) + ( changeset_revision, name, owner ) ) log.debug( 'so tool_test_results cannot be saved.' ) + log.debug( 'The attributes used to retrieve the record are:' ) + log.debug( '\ntool_shed: %s name: %s owner: %s changeset_revision: %s' % \ + ( cleaned_tool_shed_url, name, owner, changeset_revision ) )
def run_tests( test_config ): loader = nose.loader.TestLoader( config=test_config )
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.