2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/35328380ac82/ Changeset: 35328380ac82 Branch: next-stable User: Dave Bouvier Date: 2013-10-23 16:09:16 Summary: Clean up uninstallation filter. Fix recording of installation errors. Affected #: 1 file diff -r f3c2d456413d9c586c1ac9d861c3c2acca510def -r 35328380ac82c471a942bd6f0b5a4e73413bf272 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 @@ -252,10 +252,8 @@ if repository.status in [ app.model.ToolShedRepository.installation_status.UNINSTALLED, app.model.ToolShedRepository.installation_status.DEACTIVATED ]: continue - if repository.status not in [ app.model.ToolShedRepository.installation_status.UNINSTALLED, - app.model.ToolShedRepository.installation_status.ERROR, - app.model.ToolShedRepository.installation_status.INSTALLED, - app.model.ToolShedRepository.installation_status.DEACTIVATED ]: + if repository.status not in [ app.model.ToolShedRepository.installation_status.ERROR, + app.model.ToolShedRepository.installation_status.INSTALLED ]: repository.status = app.model.ToolShedRepository.installation_status.ERROR sa_session.add( repository ) sa_session.flush() @@ -1155,11 +1153,10 @@ repository = test_db_util.get_installed_repository_by_name_owner_changeset_revision( name, owner, changeset_revision ) except: log.exception( 'Unable to uninstall, no installed repository found.' ) - continue - test_result = dict( tool_shed=repository.tool_shed, - name=repository.name, - owner=repository.owner, - changeset_revision=repository.changeset_revision, + test_result = dict( tool_shed=galaxy_tool_shed_url, + name=repository_info_dict[ 'name' ], + owner=repository_info_dict[ 'owner' ], + changeset_revision=repository_info_dict[ 'changeset_revision' ], error_message=extract_log_data( result, from_tool_test=False ) ) repository_status[ 'installation_errors' ][ 'repository_dependencies' ].append( test_result ) params[ 'tools_functionally_correct' ] = False @@ -1170,7 +1167,11 @@ repository_status, repository_info_dict, params ) - success = execute_uninstall_method( app, deactivate_only ) + try: + success = execute_uninstall_method( app, deactivate_only ) + except: + log.exception( 'Encountered error attempting to uninstall %s.', repository_info_dict[ 'name' ] ) + success = False if not success: log.error( 'Repository %s failed to uninstall.', repository_info_dict[ 'name' ] ) repositories_failed_install.append( dict( name=name, owner=owner, changeset_revision=changeset_revision ) ) https://bitbucket.org/galaxy/galaxy-central/commits/06d5abc6d407/ Changeset: 06d5abc6d407 User: Dave Bouvier Date: 2013-10-23 16:47:31 Summary: Merge with next-stable. Affected #: 1 file diff -r c5d68c98b9c50b42fdbc2a82f3bd85a1d320ace6 -r 06d5abc6d40748a41493d2beac87fc1cb81f5bf6 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 @@ -252,10 +252,8 @@ if repository.status in [ app.model.ToolShedRepository.installation_status.UNINSTALLED, app.model.ToolShedRepository.installation_status.DEACTIVATED ]: continue - if repository.status not in [ app.model.ToolShedRepository.installation_status.UNINSTALLED, - app.model.ToolShedRepository.installation_status.ERROR, - app.model.ToolShedRepository.installation_status.INSTALLED, - app.model.ToolShedRepository.installation_status.DEACTIVATED ]: + if repository.status not in [ app.model.ToolShedRepository.installation_status.ERROR, + app.model.ToolShedRepository.installation_status.INSTALLED ]: repository.status = app.model.ToolShedRepository.installation_status.ERROR sa_session.add( repository ) sa_session.flush() @@ -1155,11 +1153,10 @@ repository = test_db_util.get_installed_repository_by_name_owner_changeset_revision( name, owner, changeset_revision ) except: log.exception( 'Unable to uninstall, no installed repository found.' ) - continue - test_result = dict( tool_shed=repository.tool_shed, - name=repository.name, - owner=repository.owner, - changeset_revision=repository.changeset_revision, + test_result = dict( tool_shed=galaxy_tool_shed_url, + name=repository_info_dict[ 'name' ], + owner=repository_info_dict[ 'owner' ], + changeset_revision=repository_info_dict[ 'changeset_revision' ], error_message=extract_log_data( result, from_tool_test=False ) ) repository_status[ 'installation_errors' ][ 'repository_dependencies' ].append( test_result ) params[ 'tools_functionally_correct' ] = False @@ -1170,7 +1167,11 @@ repository_status, repository_info_dict, params ) - success = execute_uninstall_method( app, deactivate_only ) + try: + success = execute_uninstall_method( app, deactivate_only ) + except: + log.exception( 'Encountered error attempting to uninstall %s.', repository_info_dict[ 'name' ] ) + success = False if not success: log.error( 'Repository %s failed to uninstall.', repository_info_dict[ 'name' ] ) repositories_failed_install.append( dict( name=name, owner=owner, changeset_revision=changeset_revision ) ) 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.