Systemd 256 loginctl changes

test/common/testlib.py

@@ -1697,7 +1697,9 @@ def _terminate_sessions(self) -> None:
                 raise
 
         # terminate all systemd user services for users who are not logged in
-        m.execute("systemctl stop user@*.service")
+        # since systemd 256 we stop user@*.service now also stops the root session (uid 0)
+        m.execute("cd /run/systemd/users/; "
+                  "for f in $(ls); do [ $f -le 500 ] || systemctl stop user@$f; done")
 
         # Clean up "closing" sessions again, and clean user id cache for non-system users
         m.execute("systemctl stop systemd-logind; cd /run/systemd/users/; "

test/verify/check-session

@@ -50,7 +50,8 @@ class TestSession(testlib.MachineCase):
 
         # Check session type
         if not m.ostree_image:
-            session_id = m.execute("loginctl list-sessions | awk '/admin/ {print $1}'").strip()
+            # Systemd 256 also shows a class=manager session for admin
+            session_id = m.execute("loginctl list-sessions | grep -v manager | awk '/admin/ {print $1}'").strip()
             self.assertEqual(m.execute(f"loginctl show-session -p Type {session_id}").strip(), "Type=web")
 
         # Logout

test/verify/check-static-login

@@ -830,6 +830,9 @@ matchrule = <SUBJECT>^DC=LAN,DC=COCKPIT,CN=alice$
                 self.assertGreaterEqual(len(sessions), 1)
                 for session in sessions:
                     out = m.execute('loginctl session-status ' + session)
+                    # Skip manager session
+                    if "Class: manager" in out:
+                        continue
                     if "State: active" in out:  # skip closing sessions
                         self.assertIn(session_leader, out)
                         self.assertIn('cockpit-bridge', out)