test: refactored test execution

.coveragerc

@@ -1,9 +1,9 @@
 [run]
 source = samgis
-omit = ./venv/*,__version__.py,*tests*,*apps.py,*manage.py,*__init__.py,*migrations*,*asgi*,*wsgi*,*admin.py,*urls.py,./tests/*
+omit = ./venv/*,__version__.py,*tests*,*apps.py,*manage.py,*__init__.py,*migrations*,*asgi*,*wsgi*,*admin.py,*urls.py,./tests/*,./scripts/extract-*.py
 
 [report]
 omit = ./venv/*,*tests*,*apps.py,*manage.py,*__init__.py,*migrations*,*asgi*,*wsgi*,*admin.py,*urls.py,./tests/*
 
 exclude_lines =
-     if __name__ == .__main__.:
+    if __name__\s*==\s*['"]__main__['"]\s*:

pyproject.toml

@@ -50,7 +50,7 @@ myst-parser = "^4.0.0"
 sphinx-autodoc-defaultargs = "^0.1.2"
 
 [tool.pytest.ini_options]
-addopts = "--cov=my_ghost_writer --cov-report html"
+addopts = " --cov=scripts --cov=app --cov-report html"
 
 [build-system]
 requires = ['poetry-core (>=2.0.0,<3.0.0)']

pytest.ini

@@ -1,7 +0,0 @@
-[pytest]
-env_override_existing_values = 1
-env_files =
-    test/.test.env
-[path]
-source = app
-omit = ./venv/*,*tests*,*apps.py,*manage.py,*__init__.py,*migrations*,*asgi*,*wsgi*,*admin.py,*urls.py,./tests/*

scripts/client_health.py

@@ -18,10 +18,6 @@ ch.setFormatter(formatter)
 logger.addHandler(ch)
 
 
-# def aa():
-#    pass
-
-
 def simple_formatter_ex(ex: Exception):
     logger.error(type(ex))
     logger.error(ex)

scripts/extract-openapi-fastapi.py

@@ -10,13 +10,11 @@ from uvicorn.importer import import_from_string
 from app import project_root_folder
 
 
-parser = argparse.ArgumentParser(prog="extract-openapi-fastapi.py")
-parser.add_argument("app",       help='App import string. Eg. "main:app"', default="main:app")
-parser.add_argument("--app-dir", help="Directory containing the app", default=None)
-
-
-if __name__ == "__main__":
+if __name__ == "__main__":  # pragma: no cover
     # python scripts/extract-openapi.py fastapi_wrapper:app --app-dir wrappers --out docs/specs/openapi_new.yaml
+    parser = argparse.ArgumentParser(prog="extract-openapi-fastapi.py")
+    parser.add_argument("app",       help='App import string. Eg. "main:app"', default="main:app")
+    parser.add_argument("--app-dir", help="Directory containing the app", default=None)
     args = parser.parse_args()
 
     if args.app_dir is not None:

tests/test_app.py

@@ -7,7 +7,7 @@ from unittest.mock import patch
 from fastapi.testclient import TestClient
 from samgis_web.utilities.local_tiles_http_server import LocalTilesHttpServer
 from samgis_web.web import web_helpers
-from . import test_health
+from . import test_client_health
 
 import app
 
@@ -51,6 +51,7 @@ response_bodies_post_test = {
     }
 }
 
+
 def check_body(body: dict, expected_body: dict):
     if body != expected_body:
         logging.error(f"Wrong test: body not {body}.")
@@ -60,18 +61,18 @@ def check_body(body: dict, expected_body: dict):
 class TestFastapiApp(unittest.TestCase):
     def test_fastapi_handler_health_200(self):
         response = client.get("/health")
-        test_health.check_for_statuscode(response.status_code, 200, response)
+        test_client_health.check_for_statuscode(response.status_code, 200, response)
         body = response.json()
         check_body(body, {"msg": "still alive..."})
 
     def test_404(self):
         response = client.get("/404")
-        test_health.check_for_statuscode(response.status_code, 404, response)
+        test_client_health.check_for_statuscode(response.status_code, 404, response)
 
     def test_infer_samgis_empty_body_422(self):
         response = client.post(infer_samgis, json={})
         print(response_status_code.format(response.status_code))
-        test_health.check_for_statuscode(response.status_code, 422, response)
+        test_client_health.check_for_statuscode(response.status_code, 422, response)
         body = response.json()
         logging.info(response_body_loaded.format(body))
         check_body(body, {"msg": "Error - Unprocessable Entity"})
@@ -83,7 +84,7 @@ class TestFastapiApp(unittest.TestCase):
         local_event["source_type"] = "source_fake"
         response = client.post(infer_samgis, json=local_event)
         logging.info(response_status_code.format(response.status_code))
-        test_health.check_for_statuscode(response.status_code, 422, response)
+        test_client_health.check_for_statuscode(response.status_code, 422, response)
         body = response.json()
         logging.info(response_body_loaded.format(body))
         check_body(body, {"msg": "Error - Unprocessable Entity"})
@@ -94,7 +95,7 @@ class TestFastapiApp(unittest.TestCase):
 
         response = client.post(infer_samgis, json=event)
         logging.info(response_status_code.format(response.status_code))
-        test_health.check_for_statuscode(response.status_code, 500, response)
+        test_client_health.check_for_statuscode(response.status_code, 500, response)
         body = response.json()
         logging.info(response_body_loaded.format(body))
         check_body(body, {"msg": "Error - Internal Server Error"})
@@ -115,7 +116,7 @@ class TestFastapiApp(unittest.TestCase):
         with LocalTilesHttpServer.http_server("localhost", listen_port, directory=TEST_EVENTS_FOLDER):
             response = client.post(infer_samgis, json=event)
             logging.info(response_status_code.format(response.status_code))
-        test_health.check_for_statuscode(response.status_code, 200, response)
+        test_client_health.check_for_statuscode(response.status_code, 200, response)
         body_string = response.json()["body"]
         body_loaded = json.loads(body_string)
         logging.info(response_body_loaded.format(body_loaded))
@@ -123,7 +124,7 @@ class TestFastapiApp(unittest.TestCase):
             raise ValueError("Missing value in body")
         output = body_loaded["output"]
         if not ('n_predictions' in output and "n_shapes_geojson" in output):
-            raise ValueError("Missing value in body/2")
+            raise ValueError("Missing value in body")
         geojson = output["geojson"]
         output_geojson = shapely.from_geojson(geojson)
         logging.info("output_geojson::{}.".format(output_geojson))
@@ -150,7 +151,7 @@ class TestFastapiApp(unittest.TestCase):
 
         response = client.post(infer_samgis, json=event)
         logging.info(response_status_code.format(response.status_code))
-        test_health.check_for_statuscode(response.status_code, 200, response)
+        test_client_health.check_for_statuscode(response.status_code, 200, response)
         response_json = response.json()
         body_loaded = json.loads(response_json["body"])
         logging.info(response_body_loaded.format(body_loaded))