Skip to content

Commit 9768556

Browse files
committed
Fix test_podman_login_check finalizer to restore podman login after test
1 parent b63db29 commit 9768556

2 files changed

Lines changed: 3 additions & 21 deletions

File tree

pytest_fixtures/component/maintain.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ def sat_maintain(request):
5757
infra_host.register_to_cdn()
5858
else:
5959
infra_host = _get_satellite_host(request)
60-
60+
if getattr(infra_host, 'iop_enabled', False):
61+
satellite = request.getfixturevalue('module_target_sat')
62+
satellite.uninstall_iop()
6163
yield infra_host
6264

6365
if host_type == 'satellite_iop':

tests/foreman/maintain/test_health.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -166,26 +166,6 @@ def test_positive_health_check_by_tags(sat_maintain):
166166
)
167167

168168

169-
@pytest.mark.include_capsule
170-
def test_positive_health_check_pre_upgrade(sat_maintain):
171-
"""Verify pre-upgrade health checks
172-
173-
:id: f52bd43e-79cd-488b-adbb-3c9e5bac32cc
174-
175-
:parametrized: yes
176-
177-
:steps:
178-
1. Run satellite-maintain health check --tags pre-upgrade
179-
180-
:expectedresults: Pre-upgrade health checks should pass.
181-
"""
182-
result = sat_maintain.cli.Health.check(
183-
options={'tags': 'pre-upgrade', 'whitelist': 'non-rh-packages'}
184-
)
185-
assert result.status == 0
186-
assert 'FAIL' not in result.stdout
187-
188-
189169
@pytest.mark.include_capsule
190170
def test_positive_health_check_server_ping(sat_maintain):
191171
"""Verify server ping check

0 commit comments

Comments
 (0)