Ignore non-relevant messages from "systemd-analyze verify"

Author: CarstenGrohmann

test/test_modules.py

@@ -127,15 +127,41 @@ def test_ssh_service(host, docker_image):
     assert ssh.is_enabled
 
 
-def test_service_systemd_mask(host):
-    ssh = host.service("ssh")
+def test_service_systemd_mask(host, docker_image):
+    name = "sshd" if docker_image == "rockylinux9" else "ssh"
+    ssh = host.service(name)
     assert not ssh.is_masked
     host.run("systemctl mask ssh")
     assert ssh.is_masked
     host.run("systemctl unmask ssh")
     assert not ssh.is_masked
 
 
+def test_service_systemd_ssh(host, docker_image):
+    name = "sshd" if docker_image == "rockylinux9" else "ssh"
+    ssh = host.service(name)
+    assert ssh.exists
+    assert ssh.is_valid
+    assert ssh.is_enabled
+    assert ssh.is_running
+
+
+def test_service_systemd_root_mount(host):
+    root = host.service("-.mount")  # systemd unit for mounting /
+    assert root.exists
+    assert root.is_valid
+    assert root.is_enabled
+    assert root.is_running
+
+
+def test_service_systemd_tmp_mount(host):
+    tmp = host.service("tmp.mount")
+    assert tmp.exists
+    assert tmp.is_valid
+    assert tmp.is_enabled
+    assert tmp.is_running
+
+
 def test_salt(host):
     ssh_version = host.salt("pkg.version", "openssh-server", local=True)
     assert ssh_version.startswith("1:9.2")

testinfra/modules/service.py

@@ -219,11 +219,24 @@ def is_valid(self):
         name = self.name if self._has_systemd_suffix() else f"{self.name}.service"
         cmd = self.run("systemd-analyze verify %s", name)
         # A bad unit file still returns a rc of 0, so check the
-        # stdout for anything.  Nothing means no warns/errors.
+        # stdout for anything. Nothing means no warns/errors.
         # Docs at https://www.freedesktop.org/software/systemd/man/systemd
         # -analyze.html#Examples%20for%20verify
-        assert (cmd.stdout, cmd.stderr) == ("", "")
-        return True
+
+        # Ignore non-relevant messages from the output of "systemd-analyze
+        # verify":
+        #   "Unit is bound to inactive unit"
+        #   "ssh.service: Command 'man sshd(8)' failed with code"
+        #      --man=no: suppress the man page existence check
+        #                implemented in Systemd 235 (2017-10-06)
+        stderr_lines = [
+            i
+            for i in cmd.stderr.splitlines()
+            if "Unit is bound to inactive unit" not in i and ": Command 'man" not in i
+        ]
+
+        stderr = "".join(stderr_lines)
+        return (cmd.stdout, stderr) == ("", "")
 
     @property
     def is_masked(self):