diff options
Diffstat (limited to 'test/utils')
-rwxr-xr-x | test/utils/shutdown.exp | 8 | ||||
-rwxr-xr-x | test/utils/utils.sh | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/test/utils/shutdown.exp b/test/utils/shutdown.exp index 1d4dc9ae4..15a74f8c8 100755 --- a/test/utils/shutdown.exp +++ b/test/utils/shutdown.exp | |||
@@ -20,7 +20,7 @@ send -- "stty -echo\r" | |||
20 | after 100 | 20 | after 100 |
21 | send -- "firejail --shutdown=shutdowntesting; echo done\r" | 21 | send -- "firejail --shutdown=shutdowntesting; echo done\r" |
22 | expect { | 22 | expect { |
23 | timeout {puts "TESTING ERROR 4\n";exit} | 23 | timeout {puts "TESTING ERROR 1\n";exit} |
24 | "done" | 24 | "done" |
25 | } | 25 | } |
26 | sleep 5 | 26 | sleep 5 |
@@ -28,15 +28,15 @@ sleep 5 | |||
28 | spawn $env(SHELL) | 28 | spawn $env(SHELL) |
29 | send -- "firejail --list;echo done\r" | 29 | send -- "firejail --list;echo done\r" |
30 | expect { | 30 | expect { |
31 | timeout {puts "TESTING ERROR 5\n";exit} | 31 | timeout {puts "TESTING ERROR 2\n";exit} |
32 | "shutdowntesting" {puts "TESTING ERROR 6\n";exit} | 32 | "shutdowntesting" {puts "TESTING ERROR 3\n";exit} |
33 | "done" | 33 | "done" |
34 | } | 34 | } |
35 | sleep 1 | 35 | sleep 1 |
36 | 36 | ||
37 | send -- "firejail --shutdown=sutdowntesting\r" | 37 | send -- "firejail --shutdown=sutdowntesting\r" |
38 | expect { | 38 | expect { |
39 | timeout {puts "TESTING ERROR 5\n";exit} | 39 | timeout {puts "TESTING ERROR 4\n";exit} |
40 | "cannot find sandbox sutdowntesting" | 40 | "cannot find sandbox sutdowntesting" |
41 | } | 41 | } |
42 | after 100 | 42 | after 100 |
diff --git a/test/utils/utils.sh b/test/utils/utils.sh index c3d4a0dcf..f819c3c01 100755 --- a/test/utils/utils.sh +++ b/test/utils/utils.sh | |||
@@ -21,8 +21,12 @@ rm -f ~/firejail-test-file-7699 | |||
21 | rm -f /tmp/firejail-test-file-7699 | 21 | rm -f /tmp/firejail-test-file-7699 |
22 | rm -f /var/tmp/firejail-test-file-7699 | 22 | rm -f /var/tmp/firejail-test-file-7699 |
23 | 23 | ||
24 | echo "TESTING: audit (test/utils/audit.exp)" | 24 | if [ $(readlink /proc/self) -lt 100 ]; then |
25 | ./audit.exp | 25 | echo "TESTING SKIP: already running in pid namespace (test/utils/audit.exp)" |
26 | else | ||
27 | echo "TESTING: audit (test/utils/audit.exp)" | ||
28 | ./audit.exp | ||
29 | fi | ||
26 | 30 | ||
27 | echo "TESTING: name (test/utils/name.exp)" | 31 | echo "TESTING: name (test/utils/name.exp)" |
28 | ./name.exp | 32 | ./name.exp |