Skip to content

Commit cd1007c

Browse files
committed
refactor: use monkeypatch.setenv everywhere
1 parent 7e65060 commit cd1007c

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

tests_integration/test_integration.py

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,30 +37,32 @@
3737

3838

3939
@pytest.fixture(scope="module", autouse=True)
40-
def global_environment_setup():
40+
def global_environment_setup(monkeypatch):
4141
"""
4242
Set up the global environment variables for the tests.
4343
"""
4444
# Make sure to also set BOT_TOKEN, we cannot validate this here!
4545
assert os.environ.get("TEST_SETUP_TOKEN"), "TEST_SETUP_TOKEN must be set."
4646

4747
# In Python 3.13, this might break. https://stackoverflow.com/a/79124282
48-
os.environ["MITMPROXY_CONFDIR"] = str(MITMPROXY_CONFDIR.resolve())
49-
os.environ["SSL_CERT_FILE"] = str(MITMPROXY_CERT_BUNDLE_FILE.resolve())
50-
os.environ["REQUESTS_CA_BUNDLE"] = str(MITMPROXY_CERT_BUNDLE_FILE.resolve())
51-
os.environ["GIT_SSL_CAINFO"] = str(MITMPROXY_CERT_BUNDLE_FILE.resolve())
48+
monkeypatch.setenv("MITMPROXY_CONFDIR", str(MITMPROXY_CONFDIR.resolve()))
49+
monkeypatch.setenv("SSL_CERT_FILE", str(MITMPROXY_CERT_BUNDLE_FILE.resolve()))
50+
monkeypatch.setenv("REQUESTS_CA_BUNDLE", str(MITMPROXY_CERT_BUNDLE_FILE.resolve()))
51+
monkeypatch.setenv("GIT_SSL_CAINFO", str(MITMPROXY_CERT_BUNDLE_FILE.resolve()))
5252

5353
github_run_id = os.environ.get("GITHUB_RUN_ID", "GITHUB_RUN_ID_NOT_SET")
54-
os.environ["RUN_URL"] = (
55-
f"https://github.com/regro/cf-scripts/actions/runs/{github_run_id}"
54+
monkeypatch.setenv(
55+
"RUN_URL", f"https://github.com/regro/cf-scripts/actions/runs/{github_run_id}"
5656
)
5757

5858
# by default, we enable container mode because it is the default in the bot
59-
os.environ["CF_FEEDSTOCK_OPS_IN_CONTAINER"] = "false"
59+
monkeypatch.setenv("CF_FEEDSTOCK_OPS_IN_CONTAINER", "false")
6060

61-
# set if not set
62-
os.environ.setdefault("CF_FEEDSTOCK_OPS_CONTAINER_NAME", "conda-forge-tick")
63-
os.environ.setdefault("CF_FEEDSTOCK_OPS_CONTAINER_TAG", "test")
61+
if not os.environ.get("CF_FEEDSTOCK_OPS_CONTAINER_NAME"):
62+
monkeypatch.setenv("CF_FEEDSTOCK_OPS_CONTAINER_NAME", "conda-forge-tick")
63+
64+
if not os.environ.get("CF_FEEDSTOCK_OPS_CONTAINER_TAG"):
65+
monkeypatch.setenv("CF_FEEDSTOCK_OPS_CONTAINER_TAG", "test")
6466

6567
new_settings = settings()
6668

@@ -75,14 +77,11 @@ def global_environment_setup():
7577

7678

7779
@pytest.fixture
78-
def disable_container_mode():
80+
def disable_container_mode(monkeypatch):
7981
"""
8082
Disable container mode for the test.
8183
"""
82-
value_before = os.environ["CF_FEEDSTOCK_OPS_IN_CONTAINER"]
83-
os.environ["CF_FEEDSTOCK_OPS_IN_CONTAINER"] = "true"
84-
yield
85-
os.environ["CF_FEEDSTOCK_OPS_IN_CONTAINER"] = value_before
84+
monkeypatch.setenv("CF_FEEDSTOCK_OPS_IN_CONTAINER", "true")
8685

8786

8887
@pytest.fixture(scope="module")

0 commit comments

Comments
 (0)