From 1bd3d276f37de3e5a750ac1938cdbe32f6c9a44c Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 28 Feb 2025 13:29:09 -0800 Subject: [PATCH] Restore env vars after test --- tests/norun/test_registry.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/norun/test_registry.py b/tests/norun/test_registry.py index 45bd7b9e..7dcd43e3 100644 --- a/tests/norun/test_registry.py +++ b/tests/norun/test_registry.py @@ -112,10 +112,17 @@ def test_registry(registry, dind): r2d = make_r2d(["--image", image_name, "--push", "--no-run", str(HERE)]) docker_host, cert_dir = dind - os.environ["DOCKER_HOST"] = docker_host - os.environ["DOCKER_CERT_PATH"] = str(cert_dir / "client") - os.environ["DOCKER_TLS_VERIFY"] = "1" - r2d.start() - proc = subprocess.run(["docker", "manifest", "inspect", "--insecure", image_name]) - assert proc.returncode == 0 + old_environ = os.environ.copy() + + try: + os.environ["DOCKER_HOST"] = docker_host + os.environ["DOCKER_CERT_PATH"] = str(cert_dir / "client") + os.environ["DOCKER_TLS_VERIFY"] = "1" + r2d.start() + + proc = subprocess.run(["docker", "manifest", "inspect", "--insecure", image_name]) + assert proc.returncode == 0 + finally: + os.environ.clear() + os.environ.update(old_environ) \ No newline at end of file