Merge pull request #354 from opsmill/dga-20250413-housekeeping

Various housekeeping tasks

Author: dgarros

changelog/+pytest-httpx.housekeeping.md

@@ -0,0 +1 @@
+Update Pytest-httpx and set all responses as reusable

changelog/+pytest.housekeeping.md

@@ -0,0 +1 @@
+Add a fixture to always reset some environment variables before running tests

infrahub_sdk/yaml.py

@@ -25,7 +25,7 @@ class InfrahubFileData(BaseModel):
     api_version: InfrahubFileApiVersion = Field(InfrahubFileApiVersion.V1, alias="apiVersion")
     kind: InfrahubFileKind
     spec: dict
-    metadata: dict | None = Field(default_factory=dict)
+    metadata: dict = Field(default_factory=dict)
 
 
 class LocalFile(BaseModel):

poetry.lock

@@ -1,11 +1,14 @@
 import asyncio
+import os
 
 import pytest
 
 from infrahub_sdk.ctl import config
 
 pytest_plugins = ["pytester"]
 
+ENV_VARS_TO_CLEAN = ["INFRAHUB_ADDRESS", "INFRAHUB_TOKEN", "INFRAHUB_BRANCH", "INFRAHUB_USERNAME", "INFRAHUB_PASSWORD"]
+
 
 @pytest.fixture(scope="session")
 def event_loop():
@@ -20,3 +23,19 @@ def event_loop():
 def execute_before_any_test():
     config.SETTINGS.load_and_exit()
     config.SETTINGS.active.server_address = "http://mock"
+
+
+@pytest.fixture(scope="session", autouse=True)
+def clean_env_vars():
+    """Cleans the environment variables before any test is run."""
+    original_values = {}
+    for name in ENV_VARS_TO_CLEAN:
+        original_values[name] = os.environ.get(name)
+        if original_values[name] is not None:
+            del os.environ[name]
+
+    yield
+
+    for name in ENV_VARS_TO_CLEAN:
+        if original_values[name] is not None:
+            os.environ[name] = original_values[name]

tests/conftest.py

@@ -17,5 +17,6 @@ async def mock_gql_query_my_query(httpx_mock: HTTPXMock) -> HTTPXMock:
         method="POST",
         json=response,
         url="http://localhost:8000/api/query/my_query?branch=main&update_group=false",
+        is_reusable=True,
     )
     return httpx_mock