don't read config from file, but from DB

Author: sjanssen2

qiita_pet/handlers/cloud_handlers/file_transfer_handlers.py

@@ -3,7 +3,7 @@
 from tornado.web import HTTPError, RequestHandler
 from tornado.gen import coroutine
 
-from qiita_core.util import execute_as_transaction
+from qiita_core.util import execute_as_transaction, is_test_environment
 from qiita_db.handlers.oauth2 import authenticate_oauth
 from qiita_core.qiita_settings import qiita_config
 
@@ -93,8 +93,7 @@ def post(self):
                 filepath = os.path.abspath(os.path.join(basedatadir, filepath))
 
                 # prevent overwriting existing files, except in test mode
-                if os.path.exists(filepath) and \
-                   (not qiita_config.test_environment):
+                if os.path.exists(filepath) and (not is_test_environment()):
                     raise HTTPError(403, reason=(
                         "The requested file is already "
                         "present in Qiita's BASE_DATA_DIR!"))

qiita_pet/handlers/cloud_handlers/tests/test_file_transfer_handlers.py

@@ -5,7 +5,7 @@
 
 from qiita_db.handlers.tests.oauthbase import OauthTestingBase
 import qiita_db as qdb
-from qiita_core.qiita_settings import qiita_config
+from qiita_db.sql_connection import TRN
 
 
 class FetchFileFromCentralHandlerTests(OauthTestingBase):
@@ -72,10 +72,14 @@ def test_post(self):
         # check if error is raised, if file already exists
         with open(fp_source, 'rb') as fh:
             # we need to let qiita thinks for this test, to NOT be in test mode
-            oldval = qiita_config.test_environment
-            qiita_config.test_environment = False
+            with TRN:
+                TRN.add("UPDATE settings SET test = False")
+                TRN.execute()
             obs = self.post_authed(endpoint, files={'bar/': fh})
-            qiita_config.test_environment = oldval
+            # reset test mode to true
+            with TRN:
+                TRN.add("UPDATE settings SET test = True")
+                TRN.execute()
             self.assertIn("already present in Qiita's BASE_DATA_DIR!",
                           obs.reason)