darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 13:39:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix/main build 2 (#2819)

Browse Source 
* Removed double slash

* Fixing race condition with testing

* Created cleaner solution

* Keeping flash alive longer so tests finish in main build
This commit is contained in:
Alex Janousek
2025-08-07 15:52:56 -04:00
committed by GitHub
parent 843699061d
commit 5c00ee1840
4 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/conftest.py
View File

@@ -556,6 +556,18 @@ def mock_update_service_raise_httperror_duplicate_name(mocker):
return mocker.patch("app.service_api_client.update_service", side_effect=_update)
@pytest.fixture(autouse=True)
def _disable_e2e_mode_for_unit_tests(monkeypatch, request):
"""
Disable E2E test mode for all unit tests to prevent unmocked API calls.
E2E tests are run in a separate job and should not interfere with unit tests.
"""
# Only disable if unit tests are not being run
if "end_to_end" not in request.node.nodeid:
monkeypatch.delenv("NOTIFY_E2E_TEST_EMAIL", raising=False)
monkeypatch.delenv("NOTIFY_E2E_TEST_PASSWORD", raising=False)
SERVICE_ONE_ID = "596364a0-858e-42c8-9062-a8fe822260eb"
SERVICE_TWO_ID = "147ad62a-2951-4fa1-9ca0-093cd1a52c52"
ORGANISATION_ID = "c011fa40-4cbe-4524-b415-dde2f421bd9c"