Fix global variable

lib/galaxy_test/driver/driver_util.py

@@ -69,9 +69,8 @@ DEFAULT_LOCALES = "en"
 log = logging.getLogger("test_driver")
 
 
-# Global variables to pass database contexts around - only needed for older
+# Global variable to pass database contexts around - only needed for older
 # Tool Shed twill tests that didn't utilize the API for such interactions.
-tool_shed_context = None
 install_context = None
 
 

lib/tool_shed/test/base/driver.py

@@ -38,6 +38,9 @@ shed_data_manager_conf_xml_template = """<?xml version="1.0"?>
 <data_managers>
 </data_managers>
 """
+# Global variable to pass database contexts around - only needed for older
+# Tool Shed twill tests that didn't utilize the API for such interactions.
+tool_shed_context = None
 
 
 def build_shed_app(simple_kwargs):

lib/tool_shed/test/base/test_db_util.py

@@ -18,7 +18,7 @@ log = logging.getLogger("test.tool_shed.test_db_util")
 
 
 def sa_session():
-    from galaxy_test.driver.driver_util import tool_shed_context as sa_session
+    from .driver import tool_shed_context as sa_session
 
     return sa_session