3 files changed, 5 insertions, 4 deletions

diff --git a/test/test.py b/test/test.py
index 6734dcf..97e7567 100644
--- a/test/test.py
+++ b/test/test.py
@@ -170,7 +170,7 @@ class Mat2WebTestCase(TestCase):
 
         request = app.get(self.get_context_variable('download_uri'))
         self.assertEqual(302, request.status_code)
-        os.environ['MAT2_MAX_FILE_AGE_FOR_REMOVAL'] = '9999'
+        os.environ['MAT2_MAX_FILE_AGE_FOR_REMOVAL'] = str(15*60)
 
     def test_info_page(self):
         rv = self.client.get('/info')
@@ -191,7 +191,6 @@ class Mat2WebTestCase(TestCase):
         self.assertIn(b'Invalid Filename', rv.data)
 
 
-
 if __name__ == '__main__':
     unittest.main()
 
diff --git a/test/test_api.py b/test/test_api.py
index 63955d0..1a50aa6 100644
--- a/test/test_api.py
+++ b/test/test_api.py
@@ -42,7 +42,7 @@ class Mat2APITestCase(unittest.TestCase):
         self.assertEqual(request.status_code, 200)
 
         data = request.get_json()
-        self.assertEqual(data['output_filename'], 'test_name.cleaned.jpg')
+        self.assertEqual(data['inactive_after_sec'], 15 * 60)
         self.assertEqual(data['output_filename'], 'test_name.cleaned.jpg')
         self.assertEqual(data['mime'], 'image/jpeg')
         self.assertEqual(len(data['secret']), 64)
@@ -237,6 +237,7 @@ class Mat2APITestCase(unittest.TestCase):
 
         self.assertIn('files.', response['output_filename'])
         self.assertIn('cleaned.zip', response['output_filename'])
+        self.assertEquals(15 * 60, response['inactive_after_sec'])
         self.assertIn(response['mime'], 'application/zip')
         self.assertEqual(response['meta_after'], {})
 
@@ -387,7 +388,7 @@ class Mat2APITestCase(unittest.TestCase):
         randint_mock.return_value = 0
         self.upload_download_test_jpg_and_assert_response_code(app, 404)
 
-        os.environ['MAT2_MAX_FILE_AGE_FOR_REMOVAL'] = '9999'
+        os.environ['MAT2_MAX_FILE_AGE_FOR_REMOVAL'] = str(15 * 60)
 
     def upload_download_test_jpg_and_assert_response_code(self, app, code):
         request = app.post('/api/upload',
diff --git a/test/test_file_removal_scheduler.py b/test/test_file_removal_scheduler.py
index 1210cb2..563fc73 100644
--- a/test/test_file_removal_scheduler.py
+++ b/test/test_file_removal_scheduler.py
@@ -42,6 +42,7 @@ class Mat2WebTestCase(unittest.TestCase):
         randint_mock.return_value = 0
         file_removal_scheduler.run_file_removal_job(self.app.config['UPLOAD_FOLDER'])
         self.assertTrue(path.exists(path.join(self.upload_folder, filename)))
+        environ['MAT2_MAX_FILE_AGE_FOR_REMOVAL'] = str(15 * 60)
 
     def tearDown(self):
         shutil.rmtree(self.upload_folder)