2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/f82ad49f42e1/ Changeset: f82ad49f42e1 Branch: next-stable User: Dave Bouvier Date: 2013-10-22 21:24:05 Summary: Also exclude deactivated repositories from uninstallation. Affected #: 1 file diff -r b2c6618e150d6397e33ecd6ad4b046b580b35b83 -r f82ad49f42e16622fd807bb4e8a3b220580dee77 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 @@ -253,14 +253,15 @@ 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.INSTALLED, + app.model.ToolShedRepository.installation_status.DEACTIVATED ]: repository.status = app.model.ToolShedRepository.installation_status.ERROR sa_session.add( repository ) sa_session.flush() name = str( repository.name ) owner = str( repository.owner ) changeset_revision = str( repository.installed_changeset_revision ) - log.debug( 'Changeset revision %s of repository %s queued for uninstallation.', changeset_revision, name ) + log.debug( 'Changeset revision %s of %s repository %s queued for uninstallation.', changeset_revision, repository.status, name ) repository_dict = dict( name=name, owner=owner, changeset_revision=changeset_revision ) # Generate a test method to uninstall this repository through the embedded Galaxy application's web interface. test_install_repositories.generate_uninstall_method( repository_dict, deactivate_only ) https://bitbucket.org/galaxy/galaxy-central/commits/4a035502056b/ Changeset: 4a035502056b User: Dave Bouvier Date: 2013-10-22 21:24:55 Summary: Merge in fix from next-stable. Affected #: 1 file diff -r 556bf6487abc5a3383a399334d97e93e1a87cb54 -r 4a035502056b5b19d227a22e4cc7fa6901da3242 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 @@ -253,14 +253,15 @@ 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.INSTALLED, + app.model.ToolShedRepository.installation_status.DEACTIVATED ]: repository.status = app.model.ToolShedRepository.installation_status.ERROR sa_session.add( repository ) sa_session.flush() name = str( repository.name ) owner = str( repository.owner ) changeset_revision = str( repository.installed_changeset_revision ) - log.debug( 'Changeset revision %s of repository %s queued for uninstallation.', changeset_revision, name ) + log.debug( 'Changeset revision %s of %s repository %s queued for uninstallation.', changeset_revision, repository.status, name ) repository_dict = dict( name=name, owner=owner, changeset_revision=changeset_revision ) # Generate a test method to uninstall this repository through the embedded Galaxy application's web interface. test_install_repositories.generate_uninstall_method( repository_dict, deactivate_only ) 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.