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

@@ -47,7 +47,12 @@ def test_podman_login_check(request, sat_maintain):
     """
     iop_settings = settings.rh_cloud.iop_advisor_engine
 
-    request.addfinalizer(lambda: sat_maintain.podman_logout(iop_settings.registry))
+    # Restore podman login after test so the same host is left in good state
+    request.addfinalizer(
+        lambda: sat_maintain.podman_login(
+            iop_settings.username, iop_settings.token, iop_settings.registry
+        )
+    )
 
     check_description = 'Check whether podman needs to be logged in to the registry'
     fail_message = (
@@ -166,26 +171,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