web api forward fix

src/kernelbot/api/main.py

@@ -10,8 +10,8 @@
 from fastapi import Depends, FastAPI, Header, HTTPException, Request, UploadFile
 from fastapi.responses import JSONResponse, StreamingResponse
 
+from kernelbot.api.background_submission_manager import BackgroundSubmissionManager
 from libkernelbot.backend import KernelBackend
-from libkernelbot.background_submission_manager import BackgroundSubmissionManager
 from libkernelbot.consts import SubmissionMode
 from libkernelbot.db_types import IdentityType
 from libkernelbot.leaderboard_db import LeaderboardDB, LeaderboardRankedEntry

src/kernelbot/main.py

@@ -13,9 +13,9 @@
 from discord.ext import commands
 from env import env, init_environment
 
+from kernelbot.api.background_submission_manager import BackgroundSubmissionManager
 from libkernelbot import consts
 from libkernelbot.backend import KernelBackend
-from libkernelbot.background_submission_manager import BackgroundSubmissionManager
 from libkernelbot.launchers import GitHubLauncher, ModalLauncher
 from libkernelbot.utils import setup_logging
 

tests/conftest.py

@@ -1,33 +1,23 @@
-import os
 import subprocess
 import time
 from pathlib import Path
 
 import pytest
 
-REQUIRED = {
-    "DISCORD_TOKEN": "dummy",
-    "GITHUB_TOKEN": "dummy",
-    "GITHUB_REPO": "dummy",
-}
-
-for k, v in REQUIRED.items():
-    os.environ.setdefault(k, v)
-
-@pytest.fixture(scope="session", autouse=True)
-def _restore_env():
-    old = {k: os.environ.get(k) for k in REQUIRED}
-    try:
-        yield
-    finally:
-        for k, v in old.items():
-            if v is None:
-                os.environ.pop(k, None)
-            else:
-                os.environ[k] = v
-
 DATABASE_URL = "postgresql://postgres:postgres@localhost:5433/clusterdev"
 
+@pytest.fixture
+def with_dummy_env(monkeypatch):
+    REQUIRED = {
+        "DISCORD_TOKEN": "dummy1",
+        "GITHUB_TOKEN": "dummy1",
+        "GITHUB_REPO": "dummy1",
+    }
+
+    for k, v in REQUIRED.items():
+        monkeypatch.setenv(k, v)
+    yield
+
 
 @pytest.fixture(scope="module")
 def docker_compose(project_root: Path):

tests/test_background_submission_manager.py

@@ -1,13 +1,15 @@
 import asyncio
 import datetime
 from unittest import mock
-
+import os
 import pytest
 
-from libkernelbot.background_submission_manager import BackgroundSubmissionManager
+from kernelbot.api.background_submission_manager import BackgroundSubmissionManager
 from libkernelbot.consts import SubmissionMode
 from libkernelbot.submission import ProcessedSubmissionRequest
 
+# only replace env vars in this test file
+pytestmark = pytest.mark.usefixtures("with_dummy_env")
 
 @pytest.fixture
 def mock_backend():

tests/test_leaderboard_db.py

@@ -9,6 +9,8 @@
 from libkernelbot.db_types import IdentityType
 from libkernelbot.utils import KernelBotError
 
+# only replace env vars in this test file
+pytestmark = pytest.mark.usefixtures("with_dummy_env")
 
 def _submit_leaderboard(database, task_directory):
     """

tests/test_validate_user_header.py

@@ -6,6 +6,7 @@
 from kernelbot.api.main import validate_user_header
 from libkernelbot.db_types import IdentityType
 
+pytestmark = pytest.mark.usefixtures("with_dummy_env")
 
 class DummyDBCtx:
     def __init__(self, to_return=None, to_raise: Optional[Exception] = None):