From a70595a23e09b002946e85bf69e9910dd48448a9 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Thu, 18 Jul 2019 16:44:08 -0400
Subject: [PATCH] Better separation for integration tests.

---
 test/base/driver_util.py      | 5 +++++
 test/base/integration_util.py | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/test/base/driver_util.py b/test/base/driver_util.py
index f4591e2812a..4a140ecc339 100644
--- a/test/base/driver_util.py
+++ b/test/base/driver_util.py
@@ -933,6 +933,11 @@ class GalaxyTestDriver(TestDriver):
                         galaxy_db_path,
                         **setup_galaxy_config_kwds
                     )
+
+                    isolate_galaxy_config = getattr(config_object, "isolate_galaxy_config", False)
+                    if isolate_galaxy_config:
+                        galaxy_config["config_dir"] = tempdir
+
                     self._saved_galaxy_config = galaxy_config
 
             if galaxy_config is not None:
diff --git a/test/base/integration_util.py b/test/base/integration_util.py
index 699c98888cc..37a16a33383 100644
--- a/test/base/integration_util.py
+++ b/test/base/integration_util.py
@@ -60,6 +60,10 @@ class IntegrationInstance(UsesApiTestCaseMixin):
     # Subclasses can override this to force uwsgi for tests.
     require_uwsgi = False
 
+    # Don't pull in default configs for un-configured things from Galaxy's
+    # config directory and such.
+    isolate_galaxy_config = True
+
     @classmethod
     def setUpClass(cls):
         """Configure and start Galaxy for a test."""