Skip to content

Commit

Permalink
fix false negative
Browse files Browse the repository at this point in the history
  • Loading branch information
rmynar committed Jan 20, 2025
1 parent ce06066 commit b56a2b4
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions tests/foreman/installer/test_installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ def install_satellite(satellite, installer_args, enable_fapolicyd=False):
satellite.execute(
'firewall-cmd --permanent --add-service RH-Satellite-6 && firewall-cmd --reload'
)
# Install Satellite
satellite.execute(
# Install Satellite and return result
return satellite.execute(
InstallerCommand(installer_args=installer_args).get_command(),
timeout='30m',
)
Expand Down Expand Up @@ -300,7 +300,9 @@ def sat_default_install(module_sat_ready_rhels):
f'foreman-initial-admin-password {settings.server.admin_password}',
]
sat = module_sat_ready_rhels.pop()
install_satellite(sat, installer_args)
assert install_satellite(sat, installer_args).status == 0, (
"Satellite installation failed (non-zero return code)"
)
sat.enable_satellite_ipv6_http_proxy()
return sat

Expand All @@ -313,7 +315,9 @@ def sat_fapolicyd_install(module_sat_ready_rhels):
f'foreman-initial-admin-password {settings.server.admin_password}',
]
sat = module_sat_ready_rhels.pop()
install_satellite(sat, installer_args, enable_fapolicyd=True)
assert install_satellite(sat, installer_args, enable_fapolicyd=True).status == 0, (
"Satellite installation failed (non-zero return code)"
)
sat.enable_ipv6_dnf_and_rhsm_proxy()
sat.enable_satellite_http_proxy()
return sat
Expand All @@ -331,7 +335,9 @@ def sat_non_default_install(module_sat_ready_rhels):
'foreman-proxy-plugin-discovery-install-images true',
]
sat = module_sat_ready_rhels.pop()
install_satellite(sat, installer_args, enable_fapolicyd=True)
assert install_satellite(sat, installer_args, enable_fapolicyd=True).status == 0, (
"Satellite installation failed (non-zero return code)"
)
sat.enable_satellite_ipv6_http_proxy()
sat.execute('dnf -y --disableplugin=foreman-protector install foreman-discovery-image')
return sat
Expand Down

0 comments on commit b56a2b4

Please sign in to comment.