From 528b74ca1e470499d53719ccbeb8acd78002ee33 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 28 Mar 2016 13:13:19 -0400
Subject: [PATCH] Remove unused test job conf stuff.

Not that this wouldn't be useful - it would be but it wasn't wired up to do anything currently.
---
 scripts/functional_tests.py | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/scripts/functional_tests.py b/scripts/functional_tests.py
index 93d73d2b815..659a882eb54 100644
--- a/scripts/functional_tests.py
+++ b/scripts/functional_tests.py
@@ -28,26 +28,6 @@ from galaxy.web import buildapp
 default_galaxy_test_host = "localhost"
 
 
-# Set up a job_conf.xml that explicitly limits jobs to 10 minutes.
-job_conf_xml = '''<?xml version="1.0"?>
-<!-- A test job config that explicitly configures job running the way it is configured by default (if there is no explicit config). -->
-<job_conf>
-    <plugins>
-        <plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="4"/>
-    </plugins>
-    <handlers>
-        <handler id="main"/>
-    </handlers>
-    <destinations>
-        <destination id="local" runner="local"/>
-    </destinations>
-    <limits>
-        <limit type="walltime">00:10:00</limit>
-    </limits>
-</job_conf>
-'''
-
-
 def generate_config_file( input_filename, output_filename, config_items ):
     """Generate a config file with the configuration that has been defined for the embedded web application.
 
@@ -130,11 +110,6 @@ def main():
     if galaxy_test_tmp_dir is None:
         galaxy_test_tmp_dir = tempfile.mkdtemp()
 
-    galaxy_job_conf_file = os.environ.get( 'GALAXY_TEST_JOB_CONF',
-                                           os.path.join( galaxy_test_tmp_dir, 'test_job_conf.xml' ) )
-    # Generate the job_conf.xml file.
-    file( galaxy_job_conf_file, 'w' ).write( job_conf_xml )
-
     database_auto_migrate = False
 
     if start_server: