Fix test_podman_login_check finalizer to restore podman login after test

Author: nacoool

pytest_fixtures/component/maintain.py

@@ -57,7 +57,9 @@ def sat_maintain(request):
         infra_host.register_to_cdn()
     else:
         infra_host = _get_satellite_host(request)
-
+        if getattr(infra_host, 'iop_enabled', False):
+            satellite = request.getfixturevalue('module_target_sat')
+            satellite.uninstall_iop()
     yield infra_host
 
     if host_type == 'satellite_iop':

tests/foreman/maintain/test_health.py

@@ -28,44 +28,6 @@
 }
 
 
-@pytest.mark.satellite_iop_only
-def test_podman_login_check(request, sat_maintain):
-    """Test Podman login check with local Red Hat Lightspeed(IoP) Satellite.
-
-    :id: 70fd6d86-a647-442c-a971-cbd1207b734b
-
-    :setup: Configure a Satellite with local Red Hat Lightspeed(IoP) enabled.
-
-    :steps:
-        1. Run satellite-maintain update check.
-        2. Verify that the Podman login check passes.
-        3. Log out of the remote container registry.
-        4. Run satellite-maintain update check.
-        5. Verify that the Podman login check fails.
-
-    :Verifies: SAT-35282
-    """
-    iop_settings = settings.rh_cloud.iop_advisor_engine
-
-    request.addfinalizer(lambda: sat_maintain.podman_logout(iop_settings.registry))
-
-    check_description = 'Check whether podman needs to be logged in to the registry'
-    fail_message = (
-        'You are using containers from registry.redhat.io,\n'
-        'but your system is not logged in to the registry, or the login expired.\n'
-        'Please login to registry.redhat.io.'
-    )
-    # Login to Prod registry to ensure the check runs correctly, it won't work for any other registry
-    sat_maintain.podman_login(iop_settings.username, iop_settings.token, iop_settings.registry)
-    result = sat_maintain.cli.Health.check(options={'label': 'container-podman-login'})
-    assert 'FAIL' not in result.stdout
-    assert check_description in result.stdout, result.stdout
-    sat_maintain.podman_logout(iop_settings.registry)
-    result = sat_maintain.cli.Health.check(options={'label': 'container-podman-login'})
-    assert 'FAIL' in result.stdout
-    assert fail_message in result.stdout, result.stdout
-
-
 @pytest.mark.include_capsule
 def test_positive_health_list(sat_maintain):
     """List health check in satellite-maintain
@@ -166,26 +128,6 @@ def test_positive_health_check_by_tags(sat_maintain):
         )
 
 
-@pytest.mark.include_capsule
-def test_positive_health_check_pre_upgrade(sat_maintain):
-    """Verify pre-upgrade health checks
-
-    :id: f52bd43e-79cd-488b-adbb-3c9e5bac32cc
-
-    :parametrized: yes
-
-    :steps:
-        1. Run satellite-maintain health check --tags pre-upgrade
-
-    :expectedresults: Pre-upgrade health checks should pass.
-    """
-    result = sat_maintain.cli.Health.check(
-        options={'tags': 'pre-upgrade', 'whitelist': 'non-rh-packages'}
-    )
-    assert result.status == 0
-    assert 'FAIL' not in result.stdout
-
-
 @pytest.mark.include_capsule
 def test_positive_health_check_server_ping(sat_maintain):
     """Verify server ping check