From c9a25632253f3000641737b690a562a2c4c7d580 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 4 Mar 2023 02:47:19 +0900 Subject: [PATCH] test-execute: simplify the tests for PrivateNetwork= If an exotic network driver is loaded, there may exist an unexpected network interface. --- .../exec-privatenetwork-yes-privatemounts-no.service | 3 +-- .../exec-privatenetwork-yes-privatemounts-yes.service | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/test-execute/exec-privatenetwork-yes-privatemounts-no.service b/test/test-execute/exec-privatenetwork-yes-privatemounts-no.service index 7fbd0ff023d..83708df830d 100644 --- a/test/test-execute/exec-privatenetwork-yes-privatemounts-no.service +++ b/test/test-execute/exec-privatenetwork-yes-privatemounts-no.service @@ -3,8 +3,7 @@ Description=Test for PrivateNetwork= without mount namespacing [Service] -ExecStart=/bin/sh -x -c '! ip link | grep -E "^[0-9]+: " | grep -Ev ": (lo|(erspan|gre|gretap|ip_vti|ip6_vti|ip6gre|ip6tnl|sit|tunl)0@.*):"' -ExecStart=/bin/sh -x -c '! ip link | grep -E "^[0-9]+: " | grep -F ": dummy-test-exec:"' +ExecStart=/bin/sh -x -c '! ip link show dummy-test-exec' ExecStart=/bin/sh -x -c 'test ! -e /proc/sys/net/ipv4/conf/dummy-test-exec' # Without mount namespacing, we can access the dummy-test-exec interface through sysfs ExecStart=/bin/sh -x -c 'test -d /sys/class/net/dummy-test-exec' diff --git a/test/test-execute/exec-privatenetwork-yes-privatemounts-yes.service b/test/test-execute/exec-privatenetwork-yes-privatemounts-yes.service index eda48499fb5..874f10084ef 100644 --- a/test/test-execute/exec-privatenetwork-yes-privatemounts-yes.service +++ b/test/test-execute/exec-privatenetwork-yes-privatemounts-yes.service @@ -3,8 +3,7 @@ Description=Test for PrivateNetwork= with mount namespacing [Service] -ExecStart=/bin/sh -x -c '! ip link | grep -E "^[0-9]+: " | grep -Ev ": (lo|(erspan|gre|gretap|ip_vti|ip6_vti|ip6gre|ip6tnl|sit|tunl)0@.*):"' -ExecStart=/bin/sh -x -c '! ip link | grep -E "^[0-9]+: " | grep -F ": dummy-test-exec:"' +ExecStart=/bin/sh -x -c '! ip link show dummy-test-exec' ExecStart=/bin/sh -x -c 'test ! -e /proc/sys/net/ipv4/conf/dummy-test-exec' # With mount namespacing, we cannot access the dummy-test-exec interface through sysfs. ExecStart=/bin/sh -x -c 'test ! -e /sys/class/net/dummy-test-exec' -- 2.47.3