Add fixture to disable /usr/sbin/policy-rc.d

barneysowood · barneysowood · commit 05bf6bcf42a8 · 2025-05-29T17:12:48.000+01:00
Adds a fixture to disable /usr/sbin/policy-rc.d - on the container
images we're using this returns an exitcode of 1001, which prevents dpkg
from running service restarts on installs/upgrades, which makes the
system behave differently to a real system.
diff --git a/tests/pytests/pkg/conftest.py b/tests/pytests/pkg/conftest.py
@@ -558,3 +558,23 @@ def api_request(pkg_tests_account, salt_api):
         port=salt_api.config["rest_cherrypy"]["port"], account=pkg_tests_account
     ) as session:
         yield session
+
+
+@pytest.fixture(scope="module")
+def debian_disable_policy_rcd(grains):
+    """
+    This fixture is used to disable the /usr/sbin/policy-rc.d file on
+    Debian-based systems. This is present on container images and prevents the
+    restart of services during package installation or upgrade.
+    This is needed where we want to test pkg behaviour exactly as it would be on
+    a real system.
+
+    """
+    if grains["os_family"] == "Debian":
+        policy_rcd_path = pathlib.Path("/usr/sbin/policy-rc.d")
+        if policy_rcd_path.exists():
+            policy_rcd_path.rename(policy_rcd_path.with_suffix(".disabled"))
+            yield
+            policy_rcd_path.with_suffix(".disabled").rename(policy_rcd_path)
+    else:
+        yield
diff --git a/tests/pytests/pkg/upgrade/test_salt_upgrade.py b/tests/pytests/pkg/upgrade/test_salt_upgrade.py
@@ -132,7 +132,7 @@ def _get_running_named_salt_pid(process_name):
     return pids
 
 
-def test_salt_upgrade(salt_call_cli, install_salt):
+def test_salt_upgrade(salt_call_cli, install_salt, debian_disable_policy_rcd):
     """
     Test an upgrade of Salt, Minion and Master
     """
diff --git a/tests/pytests/pkg/upgrade/test_systemd_permissions.py b/tests/pytests/pkg/upgrade/test_systemd_permissions.py
@@ -54,9 +54,7 @@ def salt_systemd_overrides():
 
 @pytest.fixture(scope="function")
 def salt_systemd_setup(
-    salt_call_cli,
-    install_salt,
-    salt_systemd_overrides,
+    salt_call_cli, install_salt, salt_systemd_overrides, debian_disable_policy_rcd
 ):
     """
     Fixture install previous version and set systemd for salt packages
