updating to satellite 6.16

SatelliteQE · Dec 8, 2023 · cf07919 · cf07919
1 parent 13213ab
commit cf07919
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 27 deletions.
diff --git 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
@@ -1851,6 +1851,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
@@ -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
@@ -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
         )