Merge pull request #8469 from jmchilton/amqp_sep

Try separate amqp connection from database for integration testing.

test/base/driver_util.py

@@ -135,7 +135,8 @@ def setup_galaxy_config(
     prefer_template_database=False,
     log_format=None,
     conda_auto_init=False,
-    conda_auto_install=False
+    conda_auto_install=False,
+    use_shared_connection_for_amqp=False,
 ):
     """Setup environment and build config for test Galaxy instance."""
     # For certain docker operations this needs to be evaluated out - e.g. for cwltool.
@@ -238,6 +239,9 @@ def setup_galaxy_config(
         monitor_thread_join_timeout=5,
         object_store_store_by="uuid",
     )
+    if not use_shared_connection_for_amqp:
+        config["amqp_internal_connection"] = "sqlalchemy+sqlite:///%s?isolation_level=IMMEDIATE" % os.path.join(tmpdir, "control.sqlite")
+
     config.update(database_conf(tmpdir, prefer_template_database=prefer_template_database))
     config.update(install_database_conf(tmpdir, default_merged=default_install_db_merged))
     if asbool(os.environ.get("GALAXY_TEST_USE_HIERARCHICAL_OBJECT_STORE")):
@@ -929,6 +933,7 @@ class GalaxyTestDriver(TestDriver):
                         log_format=self.log_format,
                         conda_auto_init=getattr(config_object, "conda_auto_init", False),
                         conda_auto_install=getattr(config_object, "conda_auto_install", False),
+                        use_shared_connection_for_amqp=getattr(config_object, "use_shared_connection_for_amqp", False)
                     )
                     galaxy_config = setup_galaxy_config(
                         galaxy_db_path,

test/integration/test_data_manager_table_reload.py

@@ -25,6 +25,7 @@ class DataManagerIntegrationTestCase(integration_util.IntegrationTestCase, UsesS
     """Test data manager installation and table reload through the API"""
 
     framework_tool_and_types = True
+    use_shared_connection_for_amqp = True
 
     def setUp(self):
         super(DataManagerIntegrationTestCase, self).setUp()