Merge pull request #152 from c-simpson/master

Fixes for testing when running locally

Author: urirot

src/server/config.py

@@ -3,33 +3,46 @@
 from sqlalchemy_utils import database_exists, create_database
 
 # Determine if app is ran from docker or local by testing the env var "IS_LOCAL"
-IS_LOCAL = os.getenv('IS_LOCAL')
-BASE_PATH = '../local_files/' if IS_LOCAL == 'True' else '/app/static/'
+IS_LOCAL = os.getenv("IS_LOCAL")
+BASE_PATH = "../local_files/" if IS_LOCAL == "True" else "/app/static/"
 
 # Initiate postgres DB
 # best practices is to have only one engine per application process
 # https://docs.sqlalchemy.org/en/13/core/connections.html
-POSTGRES_PASSWORD = os.getenv('POSTGRES_PASSWORD', 'thispasswordisverysecure')
-POSTGRES_DATABASE = os.getenv('POSTGRES_DATABASE', 'paws')
-POSTGRES_USER = os.getenv('POSTGRES_USER', 'postgres')
-
-if IS_LOCAL == 'True':
-    DB = os.getenv('LOCAL_DB_IP', 'postgresql://postgres:' + POSTGRES_PASSWORD + '@localhost:5432/' + POSTGRES_DATABASE)
+POSTGRES_PASSWORD = os.getenv("POSTGRES_PASSWORD", "thispasswordisverysecure")
+POSTGRES_DATABASE = os.getenv("POSTGRES_DATABASE", "paws")
+POSTGRES_USER = os.getenv("POSTGRES_USER", "postgres")
+
+if IS_LOCAL == "True":
+    DB = os.getenv(
+        "LOCAL_DB_IP",
+        "postgresql://postgres:"
+        + POSTGRES_PASSWORD
+        + "@localhost:5432/"
+        + POSTGRES_DATABASE,
+    )
 else:
-    DB = 'postgresql://' + POSTGRES_USER + ':' + POSTGRES_PASSWORD + '@paws-compose-db/' + POSTGRES_DATABASE
+    DB = (
+        "postgresql://"
+        + POSTGRES_USER
+        + ":"
+        + POSTGRES_PASSWORD
+        + "@paws-compose-db/"
+        + POSTGRES_DATABASE
+    )
 
 engine = db.create_engine(DB)
 
 if not database_exists(engine.url):
     create_database(engine.url)
 
 # Initiate local file system
-RAW_DATA_PATH = BASE_PATH + 'raw_data/'
-OUTPUT_PATH = BASE_PATH + 'output/'
-LOGS_PATH = BASE_PATH + 'logs/'
-CURRENT_SOURCE_FILES_PATH = RAW_DATA_PATH + 'current/'
-REPORT_PATH = OUTPUT_PATH + 'reports/'
-ZIPPED_FILES = BASE_PATH + 'zipped/'
+RAW_DATA_PATH = BASE_PATH + "raw_data/"
+OUTPUT_PATH = BASE_PATH + "output/"
+LOGS_PATH = BASE_PATH + "logs/"
+CURRENT_SOURCE_FILES_PATH = RAW_DATA_PATH + "current/"
+REPORT_PATH = OUTPUT_PATH + "reports/"
+ZIPPED_FILES = BASE_PATH + "zipped/"
 
 os.makedirs(BASE_PATH, exist_ok=True)
 os.makedirs(RAW_DATA_PATH, exist_ok=True)
@@ -39,3 +52,7 @@
 os.makedirs(REPORT_PATH, exist_ok=True)
 os.makedirs(ZIPPED_FILES, exist_ok=True)
 
+if not (os.path.exists(LOGS_PATH + "last_execution.json")): 
+    f = open(LOGS_PATH + "last_execution.json", "w")  # Prevent 500 error from /api/statistics
+    f.write("{}")
+    f.close()

src/server/test_api.py

@@ -1,4 +1,4 @@
-import pytest, socket, requests
+import pytest, socket, requests, os
 
 #
 # Run 'pytest' from the command line
@@ -14,7 +14,12 @@
 # These codes are represented by the pytest.ExitCode enum
 
 
-SERVER_URL = "http://server:5000"
+if os.getenv("IS_LOCAL") == "True":
+    SERVER_URL = "http://localhost:3333"
+    IS_LOCAL = True
+else:
+    SERVER_URL = "http://server:5000"
+    IS_LOCAL = False
 
 ###  DNS lookup tests
 
@@ -25,22 +30,28 @@ def test_bad_dns():
 
 
 # Do we get IPs for good names?
+
+
+@pytest.mark.skipif(IS_LOCAL, reason="Not run when IS_LOCAL")
 def test_db_dns():
     assert (
         len(socket.getaddrinfo("db", "5000")) > 0
     )  # getaddrinfo works for IPv4 and v6
 
 
+@pytest.mark.skipif(IS_LOCAL, reason="Not run when IS_LOCAL")
 def test_server_dns():
     assert len(socket.getaddrinfo("server", "5000")) > 0
 
 
+@pytest.mark.skipif(IS_LOCAL, reason="Not run when IS_LOCAL")
 def test_client_dns():
     assert len(socket.getaddrinfo("client", "5000")) > 0
 
 
 # Simple API tests
 
+
 def test_currentFiles():
     response = requests.get(SERVER_URL + "/api/listCurrentFiles")
     assert response.status_code == 200