Fix issues with services and pytest-salt-factories

Fixes issues with services in the pkg upgrade systemd tests:

* Stopping a salt service that is using the log engine from
pytest-salt-factories fails if systemd is set to KillMode=process, which
is the current setup in salt's packages. Added a fixture to override
for these tests, otherwise we end up with services in a failed state.

* SaltPkgInstall.install() stops services on ubuntu/debian after install
which is the right thing to do in most cases, but in these tests we need
to check the state of services immeadiately after install. Added a
stop_services arg to install()

Author: barneysowood

tests/pytests/pkg/upgrade/test_systemd_permissions.py

@@ -1,8 +1,11 @@
 import logging
+import textwrap
 import time
+from pathlib import Path
 
 import packaging.version
 import pytest
+from saltfactories.utils.tempfiles import temp_file
 
 pytestmark = [
     pytest.mark.skip_unless_on_linux(reason="Only supported on Linux family"),
@@ -11,10 +14,47 @@
 log = logging.getLogger(__name__)
 
 
+@pytest.fixture(scope="module")
+def salt_systemd_overrides():
+    """
+    Fixture to create systemd overrides for salt-api, salt-minion, and
+    salt-master services.
+
+    This is required because the pytest-salt-factories engine does not
+    stop cleanly if you only kill the process. This leaves the systemd
+    service in a failed state.
+    """
+
+    systemd_dir = Path("/etc/systemd/system")
+    conf_name = "override.conf"
+    contents = textwrap.dedent(
+        """
+        [Service]
+        KillMode=control-group
+        TimeoutStopSec=10
+        SuccessExitStatus=SIGKILL
+        """
+    )
+
+    with temp_file(
+        name=conf_name, directory=systemd_dir / "salt-api.service.d", contents=contents
+    ), temp_file(
+        name=conf_name,
+        directory=systemd_dir / "salt-minion.service.d",
+        contents=contents,
+    ), temp_file(
+        name=conf_name,
+        directory=systemd_dir / "salt-master.service.d",
+        contents=contents,
+    ):
+        yield
+
+
 @pytest.fixture(scope="function")
 def salt_systemd_setup(
     salt_call_cli,
     install_salt,
+    salt_systemd_overrides,
 ):
     """
     Fixture install previous version and set systemd for salt packages
@@ -75,7 +115,7 @@ def test_salt_systemd_disabled_preservation(
     # Upgrade Salt (inc. minion, master, etc.) from previous version and test
     # pylint: disable=pointless-statement
     install_salt.install(upgrade=True)
-    time.sleep(10)  # give it some time
+    time.sleep(60)  # give it some time
 
     # test for disabled systemd state
     test_list = ["salt-api", "salt-minion", "salt-master"]
@@ -120,7 +160,7 @@ def test_salt_systemd_inactive_preservation(
     if not install_salt.upgrade:
         pytest.skip("Not testing an upgrade, do not run")
 
-    # ensure known state, disabled
+    # ensure known state, inactive
     test_list = ["salt-api", "salt-minion", "salt-master"]
     for test_item in test_list:
         test_cmd = f"systemctl stop {test_item}"
@@ -129,7 +169,7 @@ def test_salt_systemd_inactive_preservation(
 
     # Upgrade Salt (inc. minion, master, etc.) from previous version and test
     # pylint: disable=pointless-statement
-    install_salt.install(upgrade=True)
+    install_salt.install(upgrade=True, stop_services=False)
     time.sleep(10)  # give it some time
 
     # test for inactive systemd state
@@ -153,7 +193,7 @@ def test_salt_systemd_active_preservation(
 
     # Upgrade Salt (inc. minion, master, etc.) from previous version and test
     # pylint: disable=pointless-statement
-    install_salt.install(upgrade=True)
+    install_salt.install(upgrade=True, stop_services=False)
     time.sleep(10)  # give it some time
 
     # test for active systemd state

tests/support/pkg.py

@@ -579,9 +579,9 @@ def package_python_version(self):
             "import sys; print('{}.{}'.format(*sys.version_info))",
         ).stdout.strip()
 
-    def install(self, upgrade=False, downgrade=False):
+    def install(self, upgrade=False, downgrade=False, stop_services=True):
         self._install_pkgs(upgrade=upgrade, downgrade=downgrade)
-        if self.distro_id in ("ubuntu", "debian"):
+        if self.distro_id in ("ubuntu", "debian") and stop_services:
             self.stop_services()
 
     def stop_services(self):