Update for TestTokenQueries.py and TestWebserver.py

emission/core/get_database.py

@@ -15,7 +15,13 @@
 config = ecbc.get_config('conf/storage/db.conf',
     {"DB_HOST": "timeseries.url", "DB_RESULT_LIMIT": "timeseries.result_limit"})
 
-print("Retrieved config %s" % config)
+db_config = {}
+for key in ["DB_HOST", "DB_RESULT_LIMIT"]:
+    if key in config:
+        db_config[key] = config.get(key)
+    else:
+        db_config[key] = None
+print("Retrieved config: %s" % db_config)
 url = config.get("DB_HOST", "localhost")
 result_limit = config.get("DB_RESULT_LIMIT", 250000)
 

emission/integrationTests/storageTests/TestMongodbAuth.py

@@ -38,6 +38,8 @@
 import importlib
 import os
 
+import emission.tests.common as etc
+
 class TestMongodbAuth(unittest.TestCase):
     def setUp(self):
         self.admin_default = pymongo.MongoClient('localhost', username="admin", 
@@ -53,7 +55,7 @@ def setUp(self):
     def tearDown(self):
         self.admin_auth.command({"dropAllUsersFromDatabase": 1})
         logging.debug("Deleting test db environment variables")
-        ecc.restoreOriginalEnvVars(self.originalDBEnvVars, self.modifiedEnvVars)
+        etc.restoreOriginalEnvVars(self.originalDBEnvVars, self.modifiedEnvVars)
         logging.debug("Finished restoring original db environment variables")
         logging.debug("Restored original values are = %s" % self.originalDBEnvVars)
         try:

emission/net/api/cfc_webapp.py

@@ -61,7 +61,8 @@
 
 config = ecbc.get_config('conf/net/api/webserver.conf',
     {"WEBSERVER_PORT": "server.port", "WEBSERVER_TIMEOUT": "server.timeout",
-     "WEBSERVER_AUTH": "server.auth", "WEBSERVER_AGGREGATE_CALL_AUTH": "server.aggregate_call_auth"})
+     "WEBSERVER_AUTH": "server.auth", "WEBSERVER_AGGREGATE_CALL_AUTH": "server.aggregate_call_auth", 
+     "WEBSERVER_NOT_FOUND_REDIRECT": "paths.404_redirect"})
 server_port = config.get("WEBSERVER_PORT", 8080)
 socket_timeout = config.get("WEBSERVER_TIMEOUT", 3600)
 auth_method = config.get("WEBSERVER_AUTH", "skip")

emission/net/ext_service/push/notify_interface.py

@@ -10,6 +10,7 @@
 import json
 import logging
 import importlib
+import os
 
 import emission.core.backwards_compat_config as ecbc
 

emission/tests/storageTests/TestTokenQueries.py

@@ -3,6 +3,7 @@
 import uuid
 import json
 import os
+import re
 
 #changed all script runs from os() to subprocess.run() for consistency
 #TODO clean up commented out os() lines
@@ -168,25 +169,25 @@ def test_run_script_show(self):
         esdt.insert({'token':'y'})
         esdt.insert({'token':'z'})
         sp = subprocess.run(["python3", "bin/auth/insert_tokens.py", "--show"], capture_output=True)
-        # The first message is displayed when we run tests locally
-        # The second is displayed when we run in the CI/CD, but with the local install 
-        # The third is displayed when we run in the docker CI since the `DB_HOST` is set to `db`
-        self.assertIn(sp.stdout,
-            [b'Retrieved config {\'DB_HOST\': \'localhost\', \'DB_RESULT_LIMIT\': 250000}\nURL not formatted, defaulting to "Stage_database"\nConnecting to database URL localhost\nx\ny\nz\n',
-            b'Config file not found, returning a copy of the environment variables instead...\nRetrieved config {\'PYTHONPATH\': \'.\', \'PATH\': \'/home/runner/miniconda-23.5.2/envs/emissiontest/bin:/home/runner/miniconda-23.5.2/condabin:/snap/bin:/home/runner/.local/bin:/opt/pipx_bin:/home/runner/.cargo/bin:/home/runner/.config/composer/vendor/bin:/usr/local/.ghcup/bin:/home/runner/.dotnet/tools:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/home/runner/.dotnet/tools\', \'LC_CTYPE\': \'C.UTF-8\'}\nURL not formatted, defaulting to "Stage_database"\nConnecting to database URL localhost\nx\ny\nz\n',
-            b'Config file not found, returning a copy of the environment variables instead...\nRetrieved config {\'PYTHONPATH\': \'.\', \'DB_HOST\': \'db\', \'PATH\': \'/root/miniconda-23.5.2/envs/emissiontest/bin:/root/miniconda-23.5.2/condabin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\', \'LC_CTYPE\': \'C.UTF-8\'}\nURL not formatted, defaulting to "Stage_database"\nConnecting to database URL db\nx\ny\nz\n'
-        ])
+        # The first message is displayed when we run tests locally or run in the CI/CD, but with the local install 
+        # The second is displayed when we run tests (the `DB_HOST` is set to `db` by default):
+        #   a) in the docker CI or,
+        #   b) locally in a docker container (ad-hoc testing environment; do not expect this to be used)
+
+        stripped_out_stdout = re.sub(rb'Retrieved config.*\nURL not formatted.*\nConnecting to database.*', b'REDACTED', sp.stdout)
+        self.assertEqual(stripped_out_stdout,
+            b'Config file not found, returning a copy of the environment variables instead...\nREDACTED\nx\ny\nz\n')
 
     def test_run_script_empty(self):
         sp = subprocess.run(["python3", "bin/auth/insert_tokens.py"], capture_output=True)
-        # The first message is displayed when we run tests locally
-        # The second is displayed when we run in the CI/CD, but with the local install 
-        # The third is displayed when we run in the docker CI since the `DB_HOST` is set to `db`
-        self.assertIn(sp.stdout,
-            [b'Retrieved config {\'DB_HOST\': \'localhost\', \'DB_RESULT_LIMIT\': 250000}\nURL not formatted, defaulting to "Stage_database"\nConnecting to database URL localhost\nPlease provide the script with an argument. Use the "--help" option for more details\n',
-            b'Config file not found, returning a copy of the environment variables instead...\nRetrieved config {\'PYTHONPATH\': \'.\', \'PATH\': \'/home/runner/miniconda-23.5.2/envs/emissiontest/bin:/home/runner/miniconda-23.5.2/condabin:/snap/bin:/home/runner/.local/bin:/opt/pipx_bin:/home/runner/.cargo/bin:/home/runner/.config/composer/vendor/bin:/usr/local/.ghcup/bin:/home/runner/.dotnet/tools:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/home/runner/.dotnet/tools\', \'LC_CTYPE\': \'C.UTF-8\'}\nURL not formatted, defaulting to "Stage_database"\nConnecting to database URL localhost\nPlease provide the script with an argument. Use the "--help" option for more details\n',
-            b'Config file not found, returning a copy of the environment variables instead...\nRetrieved config {\'PYTHONPATH\': \'.\', \'DB_HOST\': \'db\', \'PATH\': \'/root/miniconda-23.5.2/envs/emissiontest/bin:/root/miniconda-23.5.2/condabin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\', \'LC_CTYPE\': \'C.UTF-8\'}\nURL not formatted, defaulting to "Stage_database"\nConnecting to database URL db\nPlease provide the script with an argument. Use the "--help" option for more details\n'
-        ])
+        # The first message is displayed when we run tests locally or run in the CI/CD, but with the local install 
+        # The second is displayed when we run tests (the `DB_HOST` is set to `db` by default):
+        #   a) in the docker CI or,
+        #   b) locally in a docker container (ad-hoc testing environment; do not expect this to be used)
+        stripped_out_stdout = re.sub(rb'Retrieved config.*\nURL not formatted.*\nConnecting to database.*', b'REDACTED', sp.stdout)
+        self.assertEqual(stripped_out_stdout,
+            b'Config file not found, returning a copy of the environment variables instead...\nREDACTED\nPlease provide the script with an argument. Use the "--help" option for more details\n'
+        )
 
     #test that no two options can be used together
     def test_run_script_mutex(self):