From 34ad0697576932797b61f560619865e0b4bd55a2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Apr 2024 10:33:53 +0200 Subject: [PATCH] sources(curl): tweak tests to use monkeypatch.setenv() Using pytests support for changing setenv() in tests makes things a little bit more concise. --- sources/test/test_curl_source.py | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/sources/test/test_curl_source.py b/sources/test/test_curl_source.py index e6bfd061..b69958bb 100644 --- a/sources/test/test_curl_source.py +++ b/sources/test/test_curl_source.py @@ -1,8 +1,6 @@ #!/usr/bin/python3 -import contextlib import hashlib -import os import re import shutil @@ -32,7 +30,7 @@ def test_curl_source_exists(tmp_path, sources_service): assert sources_service.exists(checksum, desc) -def test_curl_source_amend_secrets(sources_service): +def test_curl_source_amend_secrets(monkeypatch, sources_service): desc = { "url": "http://localhost:80/a", "secrets": { @@ -40,19 +38,13 @@ def test_curl_source_amend_secrets(sources_service): }, } - with contextlib.ExitStack() as cm: - os.environ["OSBUILD_SOURCES_CURL_SSL_CLIENT_KEY"] = "key" - os.environ["OSBUILD_SOURCES_CURL_SSL_CLIENT_CERT"] = "cert" - - def cb(): - del os.environ["OSBUILD_SOURCES_CURL_SSL_CLIENT_KEY"] - del os.environ["OSBUILD_SOURCES_CURL_SSL_CLIENT_CERT"] - cm.callback(cb) - checksum = "sha256:1111111111111111111111111111111111111111111111111111111111111111" - _, new_desc = sources_service.amend_secrets(checksum, desc) - assert new_desc["secrets"]["ssl_client_key"] == "key" - assert new_desc["secrets"]["ssl_client_cert"] == "cert" - assert new_desc["secrets"]["ssl_ca_cert"] is None + monkeypatch.setenv("OSBUILD_SOURCES_CURL_SSL_CLIENT_KEY", "key") + monkeypatch.setenv("OSBUILD_SOURCES_CURL_SSL_CLIENT_CERT", "cert") + checksum = "sha256:1111111111111111111111111111111111111111111111111111111111111111" + _, new_desc = sources_service.amend_secrets(checksum, desc) + assert new_desc["secrets"]["ssl_client_key"] == "key" + assert new_desc["secrets"]["ssl_client_cert"] == "cert" + assert new_desc["secrets"]["ssl_ca_cert"] is None def test_curl_source_amend_secrets_fail(sources_service):