From 93cfdff9103dc4216893ed494e22bdc2d870ff22 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 28 Mar 2016 18:22:19 -0400
Subject: [PATCH] Eliminate last custom config value setup in
 scripts/functional_tests.py...

... outside of driver_util. So now we can just use the driver_util config object.
---
 scripts/functional_tests.py        | 7 ++-----
 test/base/driver_util.py           | 6 ++++++
 test/tool_shed/functional_tests.py | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/functional_tests.py b/scripts/functional_tests.py
index 84e58f7e1a5..fac4e0167dd 100644
--- a/scripts/functional_tests.py
+++ b/scripts/functional_tests.py
@@ -42,7 +42,6 @@ def main():
 
     start_server = 'GALAXY_TEST_EXTERNAL' not in os.environ
 
-    shed_tool_data_table_config = 'config/shed_tool_data_table_conf.xml'
     galaxy_test_tmp_dir = driver_util.get_galaxy_test_tmp_dir()
 
     if start_server:
@@ -62,13 +61,11 @@ def main():
 
     if start_server:
         # ---- Build Application --------------------------------------------------
-        kwargs = dict( shed_tool_data_table_config=shed_tool_data_table_config )
-        kwargs.update(galaxy_config)
-        app = driver_util.build_galaxy_app(kwargs)
+        app = driver_util.build_galaxy_app(galaxy_config)
         server_wrapper = driver_util.launch_server(
             app,
             buildapp.app_factory,
-            kwargs,
+            galaxy_config,
         )
         log.info("Functional tests will be run against %s:%s" % (server_wrapper.host, server_wrapper.port))
 
diff --git a/test/base/driver_util.py b/test/base/driver_util.py
index 8f26d3cb24d..5411a11f23d 100644
--- a/test/base/driver_util.py
+++ b/test/base/driver_util.py
@@ -95,6 +95,7 @@ def setup_galaxy_config(
     use_test_file_dir=False,
     default_install_db_merged=True,
     default_tool_data_table_config_path=None,
+    default_shed_tool_data_table_config=None,
     enable_tool_shed_check=False,
     default_tool_conf=None,
     shed_tool_conf=None,
@@ -148,6 +149,10 @@ def setup_galaxy_config(
     if shed_tool_conf is not None:
         tool_conf = "%s,%s" % (tool_conf, shed_tool_conf)
 
+    shed_tool_data_table_config = default_shed_tool_data_table_config
+    if shed_tool_data_table_config is None:
+        shed_tool_data_table_config = 'config/shed_tool_data_table_conf.xml'
+
     config = dict(
         admin_users='test@bx.psu.edu',
         allow_library_path_paste=True,
@@ -169,6 +174,7 @@ def setup_galaxy_config(
         new_file_path=new_file_path,
         master_api_key=master_api_key,
         running_functional_tests=True,
+        shed_tool_data_table_config=shed_tool_data_table_config,
         template_cache_path=template_cache_path,
         template_path='templates',
         tool_config_file=tool_conf,
diff --git a/test/tool_shed/functional_tests.py b/test/tool_shed/functional_tests.py
index d55ec50176c..f4860ef1eed 100644
--- a/test/tool_shed/functional_tests.py
+++ b/test/tool_shed/functional_tests.py
@@ -133,7 +133,6 @@ def main():
             open( galaxy_shed_data_manager_conf_file, 'wb' ).write( shed_data_manager_conf_xml_template )
         kwargs = dict( migrated_tools_config=galaxy_migrated_tool_conf_file,
                        shed_data_manager_config_file=galaxy_shed_data_manager_conf_file,
-                       shed_tool_data_table_config=shed_tool_data_table_conf_file,
                        shed_tool_path=galaxy_shed_tool_path,
                        tool_data_path=tool_data_path,
 
@@ -144,6 +143,7 @@ def main():
                 use_test_file_dir=False,
                 default_install_db_merged=False,
                 default_tool_data_table_config_path=default_tool_data_table_config_path,
+                default_shed_tool_data_table_config=shed_tool_data_table_conf_file,
                 enable_tool_shed_check=True,
                 shed_tool_conf=galaxy_shed_tool_conf_file,
                 update_integrated_tool_panel=True,