From 04635a7644c2d3dabc952d05bd96616a9513b079 Mon Sep 17 00:00:00 2001
From: rmynar <64528205+rmynar@users.noreply.github.com>
Date: Mon, 20 Jan 2025 17:11:32 +0100
Subject: [PATCH] Prevent satellite-installer false negative (#17384)

fix false negative

(cherry picked from commit c251f4678dc06401046a66aa5d8c16b7d3fe55e9)
---
 tests/foreman/installer/test_installer.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tests/foreman/installer/test_installer.py b/tests/foreman/installer/test_installer.py
index a85129bfe53..777b274c2a5 100644
--- a/tests/foreman/installer/test_installer.py
+++ b/tests/foreman/installer/test_installer.py
@@ -1378,8 +1378,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',
     )
@@ -1508,7 +1508,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
 
@@ -1521,7 +1523,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
@@ -1539,7 +1543,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