2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/f3c2d456413d/ Changeset: f3c2d456413d Branch: next-stable User: Dave Bouvier Date: 2013-10-22 22:26:44 Summary: Additional filtering of repositories not to uninstall. Affected #: 1 file diff -r f82ad49f42e16622fd807bb4e8a3b220580dee77 -r f3c2d456413d9c586c1ac9d861c3c2acca510def 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 @@ -249,7 +249,8 @@ sa_session = app.model.context.current repositories_to_uninstall = sa_session.query( app.model.ToolShedRepository ).all() for repository in repositories_to_uninstall: - if repository.status == app.model.ToolShedRepository.installation_status.UNINSTALLED: + 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, https://bitbucket.org/galaxy/galaxy-central/commits/c5d68c98b9c5/ Changeset: c5d68c98b9c5 User: Dave Bouvier Date: 2013-10-22 22:27:12 Summary: Merge in next-stable. Affected #: 1 file diff -r 4a035502056b5b19d227a22e4cc7fa6901da3242 -r c5d68c98b9c50b42fdbc2a82f3bd85a1d320ace6 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 @@ -249,7 +249,8 @@ sa_session = app.model.context.current repositories_to_uninstall = sa_session.query( app.model.ToolShedRepository ).all() for repository in repositories_to_uninstall: - if repository.status == app.model.ToolShedRepository.installation_status.UNINSTALLED: + 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, 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.