From 30bcf9128e680e90d9540552074a729832d71263 Mon Sep 17 00:00:00 2001 From: Cole Higgins Date: Tue, 21 Nov 2023 14:46:48 -0500 Subject: [PATCH] updating to satellite 6.16 --- tests/foreman/ui/test_activationkey.py | 4 ++-- tests/foreman/ui/test_contenthost.py | 3 ++- tests/foreman/ui/test_organization.py | 23 +---------------------- tests/foreman/ui/test_subscription.py | 4 ++-- 4 files changed, 7 insertions(+), 27 deletions(-) diff --git a/tests/foreman/ui/test_activationkey.py b/tests/foreman/ui/test_activationkey.py index d791ded9f31..b0d1e52de21 100644 --- a/tests/foreman/ui/test_activationkey.py +++ b/tests/foreman/ui/test_activationkey.py @@ -1244,6 +1244,6 @@ def test_positive_prepare_for_sca_only_ak(target_sat, function_entitlement_manif session.organization.select(function_entitlement_manifest_org.name) ak = session.activationkey.read(ak.name) assert ( - 'This organization is not using Simple Content Access. Entitlement-based subscription management is deprecated and will be removed in Katello 4.12.' - in ak['sca_alert'] + 'This organization is not using Simple Content Access. Entitlement-based subscription ' + 'management is deprecated and will be removed in Satellite 6.16.' in ak['sca_alert'] ) diff --git a/tests/foreman/ui/test_contenthost.py b/tests/foreman/ui/test_contenthost.py index fef2fddcc6b..28ea37df065 100644 --- a/tests/foreman/ui/test_contenthost.py +++ b/tests/foreman/ui/test_contenthost.py @@ -1909,6 +1909,7 @@ def test_positive_prepare_for_sca_only_content_host( session.location.select(default_location.name) host_details = session.contenthost.read(rhel_contenthost.hostname, widget_names='details') assert ( - 'This organization is not using Simple Content Access. Entitlement-based subscription management is deprecated and will be removed in Katello 4.12.' + 'This organization is not using Simple Content Access. Entitlement-based subscription ' + 'management is deprecated and will be removed in Satellite 6.16.' in host_details['details']['sca_alert'] ) diff --git a/tests/foreman/ui/test_organization.py b/tests/foreman/ui/test_organization.py index 9fcd9f040e0..1f8887410b3 100644 --- a/tests/foreman/ui/test_organization.py +++ b/tests/foreman/ui/test_organization.py @@ -379,27 +379,6 @@ def test_positive_prepare_for_sca_only_organization(target_sat, function_entitle function_entitlement_manifest_org.name, widget_names='primary' ) assert ( - 'Simple Content Access will be required for all organizations in Katello 4.12.' + 'Simple Content Access will be required for all organizations in Satellite 6.16.' in sca_alert['primary']['sca_alert'] ) - - -def test_positive_prepare_for_sca_only_deprecation(target_sat): - """Verify that Simple Content Access endpoints are depreacated and will be required - for all organizations in Satellite 6.16 - - :id: 08539596-1bd3-4363-9737-e45f32ee5cbb - - :expectedresults: Attepting to create an Organization with sca set to False, will throw - deprecation endpoint message - """ - with target_sat.ui_session() as session: - session.organization.create( - { - 'name': gen_string('alpha'), - 'label': gen_string('alpha'), - 'simple_content_access': False, - } - ) - results = target_sat.execute('tail -100 /var/log/foreman/production.log').stdout - assert 'Simple Content Access will be required for all organizations in Katello 4.12' in results diff --git a/tests/foreman/ui/test_subscription.py b/tests/foreman/ui/test_subscription.py index 8c50d421ff3..337ae56d982 100644 --- a/tests/foreman/ui/test_subscription.py +++ b/tests/foreman/ui/test_subscription.py @@ -566,6 +566,6 @@ def test_positive_prepare_for_sca_only_subscription(target_sat, function_entitle session.organization.select(function_entitlement_manifest_org.name) sca_alert = session.subscription.sca_alert() assert ( - 'This organization is not using Simple Content Access. Entitlement-based subscription management is deprecated and will be removed in Katello 4.12.' - in sca_alert + 'This organization is not using Simple Content Access. Entitlement-based subscription ' + 'management is deprecated and will be removed in Satellite 6.16.' in sca_alert )