fix tests

Author: khvn26

src/common/gunicorn/conf.py

@@ -6,13 +6,13 @@
 
 import typing
 
+from prometheus_client.multiprocess import mark_process_dead
+
 if typing.TYPE_CHECKING:  # pragma: no cover
     from gunicorn.arbiter import Arbiter  # type: ignore[import-untyped]
     from gunicorn.workers.base import Worker  # type: ignore[import-untyped]
 
 
 def worker_exit(server: "Arbiter", worker: "Worker") -> None:
     """Detach the process Prometheus metrics collector when a worker exits."""
-    from prometheus_client import multiprocess
-
-    multiprocess.mark_process_dead(worker.pid)  # type: ignore[no-untyped-call]
+    mark_process_dead(worker.pid)  # type: ignore[no-untyped-call]

src/common/gunicorn/utils.py

@@ -41,7 +41,6 @@ def load_config(self) -> None:
             if key in cfg_settings
         )
         for key, value in options_items:
-            print(f"setting {key=} {value=}")
             self.cfg.set(key.lower(), value)
         self.load_config_from_module_name_or_filename(self.cfg.config)
 

tests/unit/common/gunicorn/test_logging.py

@@ -86,13 +86,14 @@ def test_gunicorn_prometheus_gunicorn_logger__expected_metrics(
     logger = PrometheusGunicornLogger(config)
 
     response_mock = mocker.Mock()
-    response_mock.status = 200
+    response_mock.status = b"200 OK"
+    response_mock.status_code = 200
 
     # When
     logger.access(
         response_mock,
         mocker.Mock(),
-        {"PATH_INFO": "/health", "REQUEST_METHOD": "GET"},
+        {"wsgi.django_route": "^health", "REQUEST_METHOD": "GET"},
         timedelta(milliseconds=101),
     )
 

tests/unit/common/gunicorn/test_utils.py

@@ -35,8 +35,14 @@ def test_django_wsgi_application__defaults__expected_config(
     assert app.load_wsgiapp() == wsgi_handler_mock
 
 
-def test_run_server__expected_config() -> None:
+def test_run_server__default_config_file__runs_expected(
+    mocker: pytest_mock.MockerFixture,
+) -> None:
     # Given
+    # prevent real forking from Gunicorn
+    mocker.patch("os.fork").return_value = 0
+    mark_process_dead_mock = mocker.patch("common.gunicorn.conf.mark_process_dead")
+
     def delay_kill(pid: int = os.getpid()) -> None:
         time.sleep(0.1)
         os.kill(pid, signal.SIGTERM)
@@ -48,6 +54,4 @@ def delay_kill(pid: int = os.getpid()) -> None:
         run_server()
 
     # Then
-    from prometheus_client import multiprocess
-
-    multiprocess.mark_process_dead
+    mark_process_dead_mock.assert_called()