From aebf9f8ba0171a88b60cc9d4df14c2e8d1d8fffe Mon Sep 17 00:00:00 2001 From: Satellite QE <115476073+Satellite-QE@users.noreply.github.com> Date: Thu, 30 May 2024 09:28:26 -0400 Subject: [PATCH] [6.15.z] Fix HTTP proxy teardown (#15235) Fix HTTP proxy teardown (#15229) (cherry picked from commit 46b510fb74f818ff9bcd376684f89c70c25f2356) Co-authored-by: vsedmik <46570670+vsedmik@users.noreply.github.com> --- pytest_fixtures/component/http_proxy.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pytest_fixtures/component/http_proxy.py b/pytest_fixtures/component/http_proxy.py index fcf81c09eff..6fea394f4ad 100644 --- a/pytest_fixtures/component/http_proxy.py +++ b/pytest_fixtures/component/http_proxy.py @@ -29,4 +29,5 @@ def setup_http_proxy(request, module_manifest_org, target_sat): yield http_proxy, request.param target_sat.update_setting('content_default_http_proxy', content_proxy_value) target_sat.update_setting('http_proxy', general_proxy_value) - http_proxy.delete() + if http_proxy: + http_proxy.delete()