From e29fef4c36c4aed9688003bf863f723d3e5451ba Mon Sep 17 00:00:00 2001 From: Lukas Hellebrandt Date: Thu, 4 Jan 2024 16:06:27 +0100 Subject: [PATCH 1/2] Component Evaluation - add RHEL 8 and 9 host versions --- tests/foreman/ui/test_host.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/foreman/ui/test_host.py b/tests/foreman/ui/test_host.py index 9ea2cd736db..016f35470b9 100644 --- a/tests/foreman/ui/test_host.py +++ b/tests/foreman/ui/test_host.py @@ -1535,8 +1535,9 @@ def test_global_registration_upgrade_subscription_manager( @pytest.mark.tier3 @pytest.mark.usefixtures('enable_capsule_for_registration') +@pytest.mark.rhel_ver_list([7, 8, 9]) def test_global_re_registration_host_with_force_ignore_error_options( - session, module_activation_key, default_os, default_smart_proxy, rhel7_contenthost + session, module_activation_key, default_os, default_smart_proxy, rhel_contenthost ): """If the ignore_error and force checkbox is checked then registered host can get re-registered without any error. @@ -1556,7 +1557,7 @@ def test_global_re_registration_host_with_force_ignore_error_options( :parametrized: yes """ - client = rhel7_contenthost + client = rhel_contenthost with session: cmd = session.host.get_register_command( { @@ -1568,11 +1569,13 @@ def test_global_re_registration_host_with_force_ignore_error_options( 'advanced.ignore_error': True, } ) - client.execute(cmd) + result = client.execute(cmd) + assert result.status == 0 result = client.execute('subscription-manager identity') assert result.status == 0 # rerun the register command - client.execute(cmd) + result = client.execute(cmd) + assert result.status == 0 result = client.execute('subscription-manager identity') assert result.status == 0 From be47e6699c3a398f49b86436c0df4bc113811ce1 Mon Sep 17 00:00:00 2001 From: Lukas Hellebrandt Date: Wed, 10 Jan 2024 11:49:45 +0100 Subject: [PATCH 2/2] Simplify rhel version choice --- tests/foreman/ui/test_host.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/foreman/ui/test_host.py b/tests/foreman/ui/test_host.py index 016f35470b9..49d64050be3 100644 --- a/tests/foreman/ui/test_host.py +++ b/tests/foreman/ui/test_host.py @@ -1535,7 +1535,7 @@ def test_global_registration_upgrade_subscription_manager( @pytest.mark.tier3 @pytest.mark.usefixtures('enable_capsule_for_registration') -@pytest.mark.rhel_ver_list([7, 8, 9]) +@pytest.mark.rhel_ver_match('[^6].*') def test_global_re_registration_host_with_force_ignore_error_options( session, module_activation_key, default_os, default_smart_proxy, rhel_contenthost ):