diff options
| author |   Lennart Poettering <lennart@poettering.net> | 2017-12-15 20:49:11 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2017-12-15 20:51:55 +0100 |
| commit | c4b0c4599d1d6b0cea170fc04c1a79671d3c8419 (patch) | |
| tree | 2ff2627e37ebb92d9b98124ea74b17ca4673ccdd | |
| parent | test: make sure "make" in the test directories works again (diff) | |
| download | systemd-c4b0c4599d1d6b0cea170fc04c1a79671d3c8419.tar.gz systemd-c4b0c4599d1d6b0cea170fc04c1a79671d3c8419.tar.bz2 systemd-c4b0c4599d1d6b0cea170fc04c1a79671d3c8419.zip | |
test: fix TEST-13-NSPAWN-SMOKE
We need to specify a full path to the "ip" binary and busybox "ip" has a
slightly different output than the normal ip, and won't show "DOWN".
hence instead ensure that at lest not "UP" is in there.
| -rwxr-xr-x | test/TEST-13-NSPAWN-SMOKE/test.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/TEST-13-NSPAWN-SMOKE/test.sh b/test/TEST-13-NSPAWN-SMOKE/test.sh index 239c7e073..6a0cb42ea 100755 --- a/test/TEST-13-NSPAWN-SMOKE/test.sh +++ b/test/TEST-13-NSPAWN-SMOKE/test.sh @@ -147,7 +147,7 @@ function run { # test --network-namespace-path works with a network namespace created by "ip netns" ip netns add nspawn_test _netns_opt="--network-namespace-path=/run/netns/nspawn_test" - UNIFIED_CGROUP_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn --register=no -D "$_root" "$_netns_opt" ip a | grep -E '^1: lo.*DOWN' + UNIFIED_CGROUP_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn --register=no -D "$_root" "$_netns_opt" /bin/ip a | grep -v -E '^1: lo.*UP' local r=$? ip netns del nspawn_test |