From 5bf5a3d85e91fee7438e3201cbed8f5e44192198 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 20 Sep 2022 18:30:34 -0400 Subject: [PATCH] Cleanup galaxy context no longer needed for tool shed tests. --- lib/galaxy_test/driver/driver_util.py | 3 --- lib/tool_shed/test/base/test_db_util.py | 1 - 2 files changed, 4 deletions(-) diff --git a/lib/galaxy_test/driver/driver_util.py b/lib/galaxy_test/driver/driver_util.py index a3d471c2ab6..7c95fd1c452 100644 --- a/lib/galaxy_test/driver/driver_util.py +++ b/lib/galaxy_test/driver/driver_util.py @@ -79,7 +79,6 @@ log = logging.getLogger("test_driver") # Global variables to pass database contexts around - only needed for older # Tool Shed twill tests that didn't utilize the API for such interactions. -galaxy_context = None tool_shed_context = None install_context = None @@ -633,9 +632,7 @@ def build_galaxy_app(simple_kwargs) -> GalaxyUniverseApplication: app = GalaxyUniverseApplication(**simple_kwargs) log.info("Embedded Galaxy application started") - global galaxy_context global install_context - galaxy_context = app.model.context install_context = app.install_model.context # Toolbox indexing happens via the work queue out of band recently, and, diff --git a/lib/tool_shed/test/base/test_db_util.py b/lib/tool_shed/test/base/test_db_util.py index e219f2c5939..28b432030b8 100644 --- a/lib/tool_shed/test/base/test_db_util.py +++ b/lib/tool_shed/test/base/test_db_util.py @@ -10,7 +10,6 @@ import galaxy.model import galaxy.model.tool_shed_install import tool_shed.webapp.model as model from galaxy_test.driver.driver_util import ( - galaxy_context as ga_session, install_context as install_session, tool_shed_context as sa_session, )