From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 15 Jul 2025 20:19:06 +0000 (+0900)
Subject: test-network: stop varlink.socket before stopping networkd.service
X-Git-Tag: v258-rc1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0c8f918bbd8b07d9130d456e00d010f931a1440;p=thirdparty%2Fsystemd.git

test-network: stop varlink.socket before stopping networkd.service

To avoid the following warnings:
```
systemd-networkd-tests.py[3139]: Stopping 'systemd-networkd.service', but its triggering units are still active:
systemd-networkd-tests.py[3139]: systemd-networkd-varlink.socket
```

Follow-up for b0ea79c5b5e056cd61eb518308aa5a992f6c313d.
---

diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index dc867cd1d47..e8ddf15a84e 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -423,16 +423,32 @@ def clear_udev_rules():
     rm_rf(udev_rules_dir)
 
 def save_active_units():
-    for u in ['systemd-networkd.socket', 'systemd-networkd.service',
-              'systemd-resolved.service', 'systemd-timesyncd.service',
-              'firewalld.service']:
+    for u in [
+            'systemd-networkd.socket',
+            'systemd-networkd-varlink.socket',
+            'systemd-networkd.service',
+            'systemd-resolved.service',
+            'systemd-timesyncd.service',
+            'firewalld.service'
+    ]:
         if call(f'systemctl is-active --quiet {u}') == 0:
             call(f'systemctl stop {u}')
             active_units.append(u)
 
 def restore_active_units():
+    has_socket = False
+
     if 'systemd-networkd.socket' in active_units:
-        call('systemctl stop systemd-networkd.socket systemd-networkd.service')
+        call('systemctl stop systemd-networkd.socket')
+        has_socket = True
+
+    if 'systemd-networkd-varlink.socket' in active_units:
+        call('systemctl stop systemd-networkd-varlink.socket')
+        has_socket = True
+
+    if has_socket:
+        call('systemctl stop systemd-networkd.service')
+
     for u in active_units:
         call(f'systemctl restart {u}')
 
@@ -482,6 +498,7 @@ def setup_system_units():
         for unit in [
                 'systemd-networkd.service',
                 'systemd-networkd.socket',
+                'systemd-networkd-varlink.socket',
                 'systemd-networkd-persistent-storage.service',
                 'systemd-resolved.service',
                 'systemd-timesyncd.service',
@@ -522,6 +539,13 @@ def setup_system_units():
             'StartLimitIntervalSec=0',
         ]
     )
+    create_unit_dropin(
+        'systemd-networkd-varlink.socket',
+        [
+            '[Unit]',
+            'StartLimitIntervalSec=0',
+        ]
+    )
     create_unit_dropin(
         'systemd-networkd-persistent-storage.service',
         [
@@ -553,6 +577,7 @@ def clear_system_units():
 
     rm_unit('systemd-networkd.service')
     rm_unit('systemd-networkd.socket')
+    rm_unit('systemd-networkd-varlink.socket')
     rm_unit('systemd-networkd-persistent-storage.service')
     rm_unit('systemd-resolved.service')
     rm_unit('systemd-timesyncd.service')
@@ -938,9 +963,11 @@ def stop_networkd(show_logs=True, check_failed=True):
 
     if check_failed:
         check_output('systemctl stop systemd-networkd.socket')
+        check_output('systemctl stop systemd-networkd-varlink.socket')
         check_output('systemctl stop systemd-networkd.service')
     else:
         call('systemctl stop systemd-networkd.socket')
+        call('systemctl stop systemd-networkd-varlink.socket')
         call('systemctl stop systemd-networkd.service')
 
     if show_logs: