1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a73e13655a94/ Changeset: a73e13655a94 User: greg Date: 2013-11-22 23:27:10 Summary: More fixes for the tool shed's install and test framework. Affected #: 1 file diff -r f7a0ac415489fb3d58f46872f4aa5f19712e6cab -r a73e13655a942f83d9c475d522a861fb32b0148d test/install_and_test_tool_shed_repositories/functional_tests.py --- a/test/install_and_test_tool_shed_repositories/functional_tests.py +++ b/test/install_and_test_tool_shed_repositories/functional_tests.py @@ -504,19 +504,19 @@ for dependency in repository.missing_tool_dependencies: log.debug( 'Missing tool dependency %s of type %s version %s: %s' % \ ( str( dependency.name ), str( dependency.type ), str( dependency.version ), unicodify( dependency.error_message ) ) ) - test_result = dict( type=str( dependency.type ), - name=str( dependency.name ), - version=str( dependency.version ), - error_message=unicodify( dependency.error_message ) ) + test_result = dict( type=dependency.type, + name=dependency.name, + version=sdependency.version, + error_message=dependency.error_message ) repository_status_dict[ 'installation_errors' ][ 'tool_dependencies' ].append( test_result ) for dependency in repository.missing_repository_dependencies: log.debug( 'Missing repository dependency %s changeset revision %s owned by %s: %s' % \ ( str( dependency.name ), str( dependency.changeset_revision ), str( dependency.owner ), unicodify( dependency.error_message ) ) ) - test_result = dict( tool_shed=str( dependency.tool_shed ), - name=str( dependency.name ), - owner=str( dependency.owner ), - changeset_revision=str( dependency.changeset_revision ), - error_message=unicodify( dependency.error_message ) ) + test_result = dict( tool_shed=dependency.tool_shed, + name=dependency.name, + owner=dependency.owner, + changeset_revision=dependency.changeset_revision, + error_message=dependency.error_message ) repository_status_dict[ 'installation_errors' ][ 'repository_dependencies' ].append( test_result ) # Record the status of this repository in the tool shed. params = dict( tools_functionally_correct=False, @@ -727,7 +727,14 @@ try: results_dict = test_repository_tools( app, repository, repository_dict, repository_status_dict, results_dict ) except Exception, e: - log.exception( 'Error executing tests for repository %s: %s' % ( name, str( e ) ) ) + exception_message = 'Error executing tests for repository %s: %s' % ( name, str( e ) ) + log.exception( exception_message ) + repository_status_dict[ 'failed_tests' ].append( exception_message ) + # Record the status of this repository in the tool shed. + params = dict( tools_functionally_correct=False, + do_not_test=False, + test_install_error=False ) + register_test_result( galaxy_tool_shed_url, repository_status_dict, repository_dict, params ) results_dict[ 'repositories_failed' ].append( dict( name=name, owner=owner, changeset_revision=changeset_revision ) ) total_repositories_tested += 1 results_dict[ 'total_repositories_tested' ] = total_repositories_tested @@ -909,7 +916,7 @@ register_test_result( galaxy_tool_shed_url, repository_status_dict, repository_dict, params ) log.debug( 'Revision %s of repository %s installed and passed functional tests.' % ( str( changeset_revision ), str( name ) ) ) else: - repository_status_dict[ 'failed_tests' ] = extract_log_data( result, from_tool_test=True ) + repository_status_dict[ 'failed_tests' ].append( extract_log_data( result, from_tool_test=True ) ) # Call the register_test_result method, which executes a PUT request to the repository_revisions API controller with the outcome # of the tests, and updates tool_test_results with the relevant log data. # This also sets the do_not_test and tools_functionally correct flags to the appropriate values, and updates the time_last_tested 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.