FTS:893 Update reuse tests

src/fts3rest/fts3rest/tests/functional/test_job_cancel.py

@@ -415,7 +415,12 @@ class TestJobCancel(TestController):
         # Is it in the database?
         job = Session.query(Job).get(job_id)
         self.assertEqual(job.job_state, 'CANCELED')
-        self.assertEqual(job.job_type, 'Y')
+        
+        auto_session_reuse = pylons.config['fts3.AutoSessionReuse']
+        if auto_session_reuse == 'true':
+            self.assertEqual(job.job_type, 'Y')
+        else:
+            self.assertEqual(job.job_type, 'N')
 
         self.assertNotEqual(None, job.job_finished)
         for f in job.files:

src/fts3rest/fts3rest/tests/functional/test_multiple.py

@@ -20,7 +20,7 @@ import json
 from fts3rest.tests import TestController
 from fts3rest.lib.base import Session
 from fts3.model import Job, File
-
+import pylons
 
 class TestMultiple(TestController):
     """
@@ -416,8 +416,12 @@ class TestMultiple(TestController):
         ).json['job_id']
 
         job = Session.query(Job).get(job_id)
-        self.assertEqual(job.job_type, 'Y')
-
+        auto_session_reuse = pylons.config['fts3.AutoSessionReuse']
+        if auto_session_reuse == 'true':
+            self.assertEqual(job.job_type, 'Y')
+        else:
+            self.assertEqual(job.job_type, 'N')
+            
         files = Session.query(File).filter(File.job_id == job_id)
         hashed = files[0].hashed_id
         for f in files: