From bc7013f2bae34d84c95f8c93e3e05a6730bff351 Mon Sep 17 00:00:00 2001 From: Arvind Jangir <54496821+arvind4501@users.noreply.github.com> Date: Thu, 23 Jul 2026 12:42:43 +0530 Subject: [PATCH] Fix OSP compute resource cleanup (#22170) * Fix OSP compute resource cleanup * delete by both name and id --------- Co-authored-by: Arvind Jangir (cherry picked from commit 600d95371fe1655c7caea3077705f670d6ec8204) --- tests/foreman/cli/test_computeresource_osp.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/foreman/cli/test_computeresource_osp.py b/tests/foreman/cli/test_computeresource_osp.py index f4f77a1f547..fa32022b9fd 100644 --- a/tests/foreman/cli/test_computeresource_osp.py +++ b/tests/foreman/cli/test_computeresource_osp.py @@ -29,15 +29,12 @@ class TestOSPComputeResourceTestCase: """OSPComputeResource CLI tests.""" - def cr_cleanup(self, cr_id, id_type, target_sat): + def cr_cleanup(self, id_type, value, target_sat): """Finalizer for removing CR from Satellite. This should remove ssh key pairs from OSP in case of test fail. """ - try: - target_sat.cli.ComputeResource.delete({id_type: cr_id}) - assert not target_sat.cli.ComputeResource.exists(search=(id_type, cr_id)) - except CLIReturnCodeError: - pass + target_sat.cli.ComputeResource.delete({id_type: value}) + assert not target_sat.cli.ComputeResource.exists(search=(id_type, value)) @pytest.fixture def osp_version(request): @@ -76,7 +73,9 @@ def test_crud_and_duplicate_name(self, request, id_type, osp_version, target_sat 'url': osp_version, } ) - request.addfinalizer(lambda: self.cr_cleanup(compute_resource['id'], id_type, target_sat)) + request.addfinalizer( + lambda: self.cr_cleanup(id_type, compute_resource[id_type], target_sat) + ) assert compute_resource['name'] == name assert target_sat.cli.ComputeResource.exists(search=(id_type, compute_resource[id_type]))