From 1d5f14bed5998a523f4782e6d69e783d5329d771 Mon Sep 17 00:00:00 2001 From: Satellite QE <115476073+Satellite-QE@users.noreply.github.com> Date: Fri, 26 Jan 2024 12:30:39 -0500 Subject: [PATCH] [6.15.z] Use sca enabled manifest for test_positive_configure_cloud_connector (#13909) --- pytest_fixtures/component/taxonomy.py | 10 ++++++++++ tests/foreman/ui/test_rhc.py | 6 ++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pytest_fixtures/component/taxonomy.py b/pytest_fixtures/component/taxonomy.py index ebfc9126eac..e6ac87357cd 100644 --- a/pytest_fixtures/component/taxonomy.py +++ b/pytest_fixtures/component/taxonomy.py @@ -196,6 +196,16 @@ def module_extra_rhel_entitlement_manifest(): yield manifest +@pytest.fixture(scope='module') +def module_extra_rhel_sca_manifest(): + """Yields a manifest in sca mode with subscriptions determined by the + 'manifest_category.extra_rhel_entitlement` setting in conf/manifest.yaml.""" + with Manifester( + manifest_category=settings.manifest.extra_rhel_entitlement, simple_content_access="enabled" + ) as manifest: + yield manifest + + @pytest.fixture(scope='module') def module_sca_manifest(): """Yields a manifest in Simple Content Access mode with subscriptions determined by the diff --git a/tests/foreman/ui/test_rhc.py b/tests/foreman/ui/test_rhc.py index d9aa8e1a111..ab973ec079c 100644 --- a/tests/foreman/ui/test_rhc.py +++ b/tests/foreman/ui/test_rhc.py @@ -65,13 +65,11 @@ def fixture_setup_rhc_satellite( request, module_target_sat, module_rhc_org, - module_extra_rhel_entitlement_manifest, + module_extra_rhel_sca_manifest, ): """Create Organization and activation key after successful test execution""" if settings.rh_cloud.crc_env == 'prod': - module_target_sat.upload_manifest( - module_rhc_org.id, module_extra_rhel_entitlement_manifest.content - ) + module_target_sat.upload_manifest(module_rhc_org.id, module_extra_rhel_sca_manifest.content) yield if request.node.rep_call.passed: # Enable and sync required repos