Merge pull request #3365 from jmchilton/integration_tests_1

Attempt to fix broken integration tests on Jenkins.

lib/galaxy/config.py

@@ -73,7 +73,9 @@ class Configuration( object ):
         # Where dataset files are stored
         self.file_path = resolve_path( kwargs.get( "file_path", "database/files" ), self.root )
         self.new_file_path = resolve_path( kwargs.get( "new_file_path", "database/tmp" ), self.root )
-        tempfile.tempdir = self.new_file_path
+        override_tempdir = string_as_bool( kwargs.get( "override_tempdir", "True" ) )
+        if override_tempdir:
+            tempfile.tempdir = self.new_file_path
         self.openid_consumer_cache_path = resolve_path( kwargs.get( "openid_consumer_cache_path", "database/openid_consumer_cache" ), self.root )
         self.cookie_path = kwargs.get( "cookie_path", "/" )
         # Galaxy OpenID settings

test/base/driver_util.py

@@ -184,6 +184,7 @@ def setup_galaxy_config(
         library_import_dir=library_import_dir,
         log_destination="stdout",
         new_file_path=new_file_path,
+        override_tempdir=False,
         master_api_key=master_api_key,
         running_functional_tests=True,
         shed_tool_data_table_config=shed_tool_data_table_config,

test/integration/test_job_resubmission.py

@@ -53,9 +53,9 @@ class JobResubmissionIntegrationTestCase(integration_util.IntegrationTestCase):
                                                     "failure_state": "unknown_error"})
 
     def test_condition_any_failure(self):
-        self._assert_job_fails(resource_parameters={"test_name": "test_condition_any_failure",
-                                                    "initial_destination": "fail_first_any_failure",
-                                                    "failure_state": "unknown_error"})
+        self._assert_job_passes(resource_parameters={"test_name": "test_condition_any_failure",
+                                                     "initial_destination": "fail_first_any_failure",
+                                                     "failure_state": "unknown_error"})
 
     def test_condition_attempt(self):
         self._assert_job_fails(resource_parameters={"test_name": "test_condition_attempt",