From 322d94dc315d26049aab9f5199cb215b9d2fb628 Mon Sep 17 00:00:00 2001 From: vsedmik <46570670+vsedmik@users.noreply.github.com> Date: Fri, 26 Jul 2024 16:57:29 +0200 Subject: [PATCH] Harden docker/podman asserts a bit (#15779) --- tests/foreman/api/test_capsulecontent.py | 7 +++++++ tests/foreman/api/test_repository.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/foreman/api/test_capsulecontent.py b/tests/foreman/api/test_capsulecontent.py index ca3ce290372..4954bab567b 100644 --- a/tests/foreman/api/test_capsulecontent.py +++ b/tests/foreman/api/test_capsulecontent.py @@ -51,6 +51,7 @@ get_repomd_revision, ) from robottelo.utils.datafactory import gen_string +from robottelo.utils.issue_handlers import is_open @pytest.fixture @@ -909,6 +910,8 @@ def test_positive_sync_container_repo_end_to_end( :BZ: 2125244, 2148813 + :Verifies: SAT-25813 + :customerscenario: true """ upstream_names = [ @@ -972,11 +975,15 @@ def test_positive_sync_container_repo_end_to_end( f'{con_client} search {module_capsule_configured.hostname}/{path}' ) assert result.status == 0 + if not is_open('SAT-25813'): + assert f'{module_capsule_configured.hostname}/{path}' in result.stdout result = module_container_contenthost.execute( f'{con_client} pull {module_capsule_configured.hostname}/{path}' ) assert result.status == 0 + result = module_container_contenthost.execute(f'{con_client} images') + assert f'{module_capsule_configured.hostname}/{path}' in result.stdout result = module_container_contenthost.execute( f'{con_client} rmi {module_capsule_configured.hostname}/{path}' diff --git a/tests/foreman/api/test_repository.py b/tests/foreman/api/test_repository.py index bba1eef6589..9195ed64fc4 100644 --- a/tests/foreman/api/test_repository.py +++ b/tests/foreman/api/test_repository.py @@ -648,7 +648,7 @@ def test_positive_update_checksum(self, repo_options, repo): def test_positive_update_repo_url_and_unprotected_flag(self, repo): """Update repository url and unprotected flag to another valid one. - :id: 0ef399a7-6d3a-4746-b415-298794497c51 + :id: 45ddfea2-ba37-45b8-95bb-9e92b8a3a946 :parametrized: yes