Jon Chery
e15eea067b
P5 final-review-ship complete: dual-read fallback removed (REQ-164) — core/env.py NOVA-only, .env.secrets load paths NOVA-only (G-106 retired), nova_tagging.py hard-fails any acdl:* tag, legacy ACDL_* Gitea secrets deleted, ACDL_LIFECYCLE_MODE/ACDL_LOCAL_TIER/ACDL_HITL_* exports removed from scripts, SNS subject → Nova SoD halt (P1-2), bootstrap scripts NOVA-only. Review: 2 P0 auto-fixed (duplicate delenv), P1-1/P1-2 resolved, doc-drift fixed. Audit: tags v1.15.0-4 exist; traceability REQ-155..164 all complete; ARCHITECTURE naming table matches codebase. 615 pytest PASS; run_ci.sh 3-stage PASS. NOVA_MIGRATION.md marked COMPLETE. ---ci--- project: acdl phase: 5 milestone: v1.15 status: complete phase_role: final requirements: covered: [REQ-155, REQ-156, REQ-157, REQ-158, REQ-159, REQ-160, REQ-161, REQ-162, REQ-163, REQ-164] partial: [] ---/ci---
56 lines
2.0 KiB
Python
56 lines
2.0 KiB
Python
"""Unit tests for the NOVA-only env helper (core/env.py, D-108, REQ-164).
|
|
|
|
P5 (REQ-164) removed the ACDL_* dual-read fallback. `get_env` now reads
|
|
`NOVA_*` only. These tests verify:
|
|
- only NOVA_* set → returned
|
|
- neither set → default returned
|
|
- ACDL_* set but NOVA_* unset → default returned (fallback REMOVED)
|
|
- blank NOVA_* → default returned (not the ACDL_* value)
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
from core import env
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _isolate_env(monkeypatch):
|
|
"""Ensure no ACDL_*/NOVA_* leakage between tests."""
|
|
for key in list(__import__("os").environ):
|
|
if key.startswith(("ACDL_", "NOVA_")):
|
|
monkeypatch.delenv(key, raising=False)
|
|
yield
|
|
|
|
|
|
def test_only_nova_set(monkeypatch):
|
|
monkeypatch.setenv("NOVA_AWS_ACCOUNT_ID", "nova-value")
|
|
assert env.get_env("AWS_ACCOUNT_ID") == "nova-value"
|
|
|
|
|
|
def test_neither_set_returns_default():
|
|
assert env.get_env("AWS_ACCOUNT_ID") is None
|
|
assert env.get_env("AWS_ACCOUNT_ID", default="581513795199") == "581513795199"
|
|
|
|
|
|
def test_only_acdl_set_no_fallback(monkeypatch):
|
|
# P5 (REQ-164): ACDL_* fallback removed — ACDL_* alone returns default.
|
|
monkeypatch.setenv("ACDL_AWS_ACCOUNT_ID", "acdl-value")
|
|
assert env.get_env("AWS_ACCOUNT_ID") is None
|
|
assert env.get_env("AWS_ACCOUNT_ID", default="fallback") == "fallback"
|
|
|
|
|
|
def test_both_set_nova_wins(monkeypatch):
|
|
# NOVA_* takes precedence; ACDL_* is ignored.
|
|
monkeypatch.setenv("NOVA_AWS_ACCOUNT_ID", "nova-value")
|
|
monkeypatch.setenv("ACDL_AWS_ACCOUNT_ID", "acdl-value")
|
|
assert env.get_env("AWS_ACCOUNT_ID") == "nova-value"
|
|
|
|
|
|
def test_blank_nova_returns_default_not_acdl(monkeypatch):
|
|
# An explicitly-empty NOVA key returns default (not an ACDL_* value).
|
|
monkeypatch.setenv("NOVA_AWS_ACCOUNT_ID", "")
|
|
monkeypatch.setenv("ACDL_AWS_ACCOUNT_ID", "acdl-value")
|
|
assert env.get_env("AWS_ACCOUNT_ID") is None
|
|
assert env.get_env("AWS_ACCOUNT_ID", default="d") == "d" |