From 8ecc86cb677bc3971baa75bf0e8c1481d8e3aef4 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Wed, 17 Jan 2018 19:32:15 +0100 Subject: [PATCH] Simplify conda framework setup Thanks @nsoranzo! --- test/base/driver_util.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/base/driver_util.py b/test/base/driver_util.py index 131a72b173a..7f9ff9ede21 100644 --- a/test/base/driver_util.py +++ b/test/base/driver_util.py @@ -796,8 +796,6 @@ class GalaxyTestDriver(TestDriver): """Instantial a Galaxy-style nose TestDriver for testing Galaxy.""" testing_shed_tools = False - conda_auto_init = False - conda_auto_install = False def setup(self, config_object=None): """Setup a Galaxy server for functional test (if needed). @@ -856,8 +854,8 @@ class GalaxyTestDriver(TestDriver): datatypes_conf=datatypes_conf_override, prefer_template_database=getattr(config_object, "prefer_template_database", False), log_format=log_format, - conda_auto_init=self.conda_auto_init, - conda_auto_install=self.conda_auto_install, + conda_auto_init=getattr(config_object, "conda_auto_init", False), + conda_auto_install=getattr(config_object, "conda_auto_install", False), ) galaxy_config = setup_galaxy_config( galaxy_db_path,