X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=test%2Fcompression.test;h=f0952a4fb935ef2eef011c228a4716e7fee7017a;hb=4c704a92f4fd9c162995b69ab063f6fa59c20c26;hp=77efd6d39762f7e0aff79b53a152dbf3ffbcf1ad;hpb=cfe507c299935bd231be698b8a426cc730f52936;p=tinc

diff --git a/test/compression.test b/test/compression.test
index 77efd6d3..f0952a4f 100755
--- a/test/compression.test
+++ b/test/compression.test
@@ -2,7 +2,7 @@
 
 . ./testlib.sh
 
-test "$(id -u)" = "0" || exit $EXIT_SKIP_TEST
+require_root "$0" "$@"
 test -e /dev/net/tun || exit $EXIT_SKIP_TEST
 ip netns list || exit $EXIT_SKIP_TEST
 command -v socat || exit $EXIT_SKIP_TEST
@@ -106,11 +106,12 @@ for level in $levels; do
   wait_script foo hosts/bar-up
   wait_script bar hosts/foo-up
 
-  ip netns exec foo \
-    socat -u TCP4-LISTEN:$recv_port_foo,reuseaddr OPEN:"$tmp_file",creat &
-
-  ip netns exec bar \
-    socat -u OPEN:"$ref_file" TCP4:$ip_foo:$recv_port_foo,retry=30
+  try_limit_time 60 sh <<EOF
+    set -eu
+    ip netns exec foo socat -u TCP4-LISTEN:$recv_port_foo,reuseaddr OPEN:"$tmp_file",creat &
+    ip netns exec bar socat -u OPEN:"$ref_file" TCP4:$ip_foo:$recv_port_foo,retry=30 &
+    wait
+EOF
 
   diff -w "$ref_file" "$tmp_file"
 
@@ -124,7 +125,7 @@ for level in $bogus_levels; do
   echo "[STEP] Testing bogus compression level $level"
   tinc foo set Compression "$level"
 
-  output=$(must_fail start_tinc foo 2>&1)
+  output=$(expect_code "$EXIT_FAILURE" start_tinc foo 2>&1)
 
   if ! echo "$output" | grep -q 'Bogus compression level'; then
     bail 'expected message about the wrong compression level'