X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=test%2Fvariables.test;h=e63138f3d13555118128c88f053e2ef22d20b245;hb=dfed43f01b69fff92321d1194a6c7c7ba54ca2d0;hp=d4c606fe6eba49de421b1424241877d23376871b;hpb=046a10d692d1ac22de4daf783ee4fe025c4eb6ec;p=tinc

diff --git a/test/variables.test b/test/variables.test
index d4c606fe..e63138f3 100755
--- a/test/variables.test
+++ b/test/variables.test
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# shellcheck source=testlib.sh
-. "${0%/*}/testlib.sh"
+. ./testlib.sh
 
 echo [STEP] Initialize one node
 
@@ -23,7 +22,7 @@ test "$(tinc foo get Mode)" = "Switch"
 
 echo [STEP] Test deletion
 
-must_fail tinc foo del Mode hub
+expect_code "$EXIT_FAILURE" tinc foo del Mode hub
 tinc foo del Mode switch
 test -z "$(tinc foo get Mode)"
 
@@ -53,7 +52,7 @@ test -z "$(tinc foo get Subnet)"
 echo [STEP] We should not be able to get/set server variables using node.variable syntax
 
 test -z "$(tinc foo get foo.Name)"
-must_fail tinc foo set foo.Name bar
+expect_code "$EXIT_FAILURE" tinc foo set foo.Name bar
 
 echo [STEP] Test getting/setting host variables for other nodes
 
@@ -81,11 +80,11 @@ test -z "$(tinc foo get bar.Subnet)"
 echo [STEP] We should not be able to get/set for nodes with invalid names
 
 touch "$DIR_FOO/hosts/qu-ux"
-must_fail tinc foo set qu-ux.Subnet 1
+expect_code "$EXIT_FAILURE" tinc foo set qu-ux.Subnet 1
 
 echo [STEP] We should not be able to set obsolete variables unless forced
 
-must_fail tinc foo set PrivateKey 12345
+expect_code "$EXIT_FAILURE" tinc foo set PrivateKey 12345
 tinc foo --force set PrivateKey 12345
 test "$(tinc foo get PrivateKey)" = "12345"