From: Nick Rosbrook <enr0n@ubuntu.com>
Date: Wed, 30 Apr 2025 23:47:42 +0000 (-0400)
Subject: networkd-test: stop resolved socket units in setUpModule()
X-Git-Tag: v258-rc1~708
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e0d3ed93a4e816f8ca5efb3760ceb640fea11bc;p=thirdparty%2Fsystemd.git

networkd-test: stop resolved socket units in setUpModule()

Avoid warnings about the socket units when stopping systemd-resolved.
---

diff --git a/test/networkd-test.py b/test/networkd-test.py
index 5f2477fccb9..72f824a8866 100755
--- a/test/networkd-test.py
+++ b/test/networkd-test.py
@@ -62,7 +62,13 @@ def setUpModule():
         raise unittest.SkipTest('not virtualized and networkd is already active')
 
     # Ensure we don't mess with an existing networkd config
-    for u in ['systemd-networkd.socket', 'systemd-networkd', 'systemd-resolved']:
+    for u in [
+        'systemd-networkd.socket',
+        'systemd-networkd',
+        'systemd-resolved-varlink.socket',
+        'systemd-resolved-monitor.socket',
+        'systemd-resolved',
+    ]:
         if subprocess.call(['systemctl', 'is-active', '--quiet', u]) == 0:
             subprocess.call(['systemctl', 'stop', u])
             running_units.append(u)