From 50f5d74984483a41660baebe74ccfc896e9068f7 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 3 Jan 2024 09:53:06 +0100 Subject: [PATCH] test: Adjust TestIPA.testClientCertAuthentication to changed loginctl 255 output format Commit 800c89f93ffa fixed this for check-static-login already. Debian testing now got systemd 255 and ran into this changed output format as well. --- test/verify/check-system-realms | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/verify/check-system-realms b/test/verify/check-system-realms index 2a2edfd5b6b..ff2a66dc239 100755 --- a/test/verify/check-system-realms +++ b/test/verify/check-system-realms @@ -421,7 +421,10 @@ class CommonTests: if "State: active" in out: # skip closing sessions self.assertIn(session_leader, out) self.assertIn('cockpit-bridge', out) - self.assertIn('cockpit; type web', out) + # systemd < 255: "Service: cockpit; type web; class user" + # systemd ≥ 255: "Service: cockpit\n Type: web\n Class: user" + self.assertRegex(out, r"Service:\s+cockpit") + self.assertRegex(out, "[tT]ype.*web") break else: self.fail("no active session for active user")