diff options
67 files changed, 86 insertions, 56 deletions
diff --git a/test/arguments/readme b/test/arguments/readme index f5844848e..c28461478 100644 --- a/test/arguments/readme +++ b/test/arguments/readme | |||
@@ -5,5 +5,5 @@ Run "make && sudo make install" to install it. | |||
5 | 5 | ||
6 | Run "make test" to run the tests. | 6 | Run "make test" to run the tests. |
7 | 7 | ||
8 | Run "make uninstall" to remove the test program. | 8 | Run "sudo make uninstall" to remove the test program. |
9 | 9 | ||
diff --git a/test/filters/caps.exp b/test/filters/caps.exp index 034d6a733..7f7cf7dd1 100755 --- a/test/filters/caps.exp +++ b/test/filters/caps.exp | |||
@@ -66,7 +66,7 @@ expect { | |||
66 | "Seccomp:" | 66 | "Seccomp:" |
67 | } | 67 | } |
68 | send -- "exit\r" | 68 | send -- "exit\r" |
69 | sleep 1 | 69 | after 100 |
70 | 70 | ||
71 | 71 | ||
72 | puts "\nall done\n" | 72 | puts "\nall done\n" |
diff --git a/test/filters/noroot.exp b/test/filters/noroot.exp index 1e08cee12..2a7cb7975 100755 --- a/test/filters/noroot.exp +++ b/test/filters/noroot.exp | |||
@@ -156,4 +156,5 @@ expect { | |||
156 | timeout {puts "TESTING ERROR 24\n";exit} | 156 | timeout {puts "TESTING ERROR 24\n";exit} |
157 | "3" | 157 | "3" |
158 | } | 158 | } |
159 | after 100 | ||
159 | puts "\nall done\n" | 160 | puts "\nall done\n" |
diff --git a/test/filters/protocol.exp b/test/filters/protocol.exp index 82e9a63eb..835f645b2 100755 --- a/test/filters/protocol.exp +++ b/test/filters/protocol.exp | |||
@@ -180,6 +180,6 @@ expect { | |||
180 | timeout {puts "TESTING ERROR 4.9\n";exit} | 180 | timeout {puts "TESTING ERROR 4.9\n";exit} |
181 | "after socket" | 181 | "after socket" |
182 | } | 182 | } |
183 | sleep 1 | 183 | after 100 |
184 | 184 | ||
185 | puts "\nall done\n" | 185 | puts "\nall done\n" |
diff --git a/test/filters/seccomp-bad-empty.exp b/test/filters/seccomp-bad-empty.exp index 53f06e632..1bd9c9b1f 100755 --- a/test/filters/seccomp-bad-empty.exp +++ b/test/filters/seccomp-bad-empty.exp | |||
@@ -36,6 +36,6 @@ expect { | |||
36 | timeout {puts "TESTING ERROR 7\n";exit} | 36 | timeout {puts "TESTING ERROR 7\n";exit} |
37 | "Error: line 1 in seccomp-bad-empty2.profile is invalid" | 37 | "Error: line 1 in seccomp-bad-empty2.profile is invalid" |
38 | } | 38 | } |
39 | sleep 1 | 39 | after 100 |
40 | puts "\nall done\n" | 40 | puts "\nall done\n" |
41 | 41 | ||
diff --git a/test/filters/seccomp-chmod-profile.exp b/test/filters/seccomp-chmod-profile.exp index e5d16f524..463ce05e9 100755 --- a/test/filters/seccomp-chmod-profile.exp +++ b/test/filters/seccomp-chmod-profile.exp | |||
@@ -47,5 +47,5 @@ expect { | |||
47 | } | 47 | } |
48 | 48 | ||
49 | send -- "exit\r" | 49 | send -- "exit\r" |
50 | sleep 1 | 50 | after 100 |
51 | puts "\nall done\n" | 51 | puts "\nall done\n" |
diff --git a/test/filters/seccomp-chmod.exp b/test/filters/seccomp-chmod.exp index 9ca084e7f..b17990e3a 100755 --- a/test/filters/seccomp-chmod.exp +++ b/test/filters/seccomp-chmod.exp | |||
@@ -47,5 +47,5 @@ expect { | |||
47 | } | 47 | } |
48 | 48 | ||
49 | send -- "exit\r" | 49 | send -- "exit\r" |
50 | sleep 1 | 50 | after 100 |
51 | puts "\nall done\n" | 51 | puts "\nall done\n" |
diff --git a/test/filters/seccomp-chown.exp b/test/filters/seccomp-chown.exp index 4e393fea2..a54d279f1 100755 --- a/test/filters/seccomp-chown.exp +++ b/test/filters/seccomp-chown.exp | |||
@@ -45,5 +45,5 @@ expect { | |||
45 | 45 | ||
46 | 46 | ||
47 | send -- "exit\r" | 47 | send -- "exit\r" |
48 | sleep 1 | 48 | after 100 |
49 | puts "\n" | 49 | puts "\nall done\n" |
diff --git a/test/filters/seccomp-dualfilter.exp b/test/filters/seccomp-dualfilter.exp index 8a48130b3..958dab528 100755 --- a/test/filters/seccomp-dualfilter.exp +++ b/test/filters/seccomp-dualfilter.exp | |||
@@ -51,4 +51,5 @@ expect { | |||
51 | "Parent is shutting down" | 51 | "Parent is shutting down" |
52 | } | 52 | } |
53 | 53 | ||
54 | after 100 | ||
54 | puts "\nall done\n" | 55 | puts "\nall done\n" |
diff --git a/test/filters/seccomp-empty.exp b/test/filters/seccomp-empty.exp index 11b275c7d..d150dac7d 100755 --- a/test/filters/seccomp-empty.exp +++ b/test/filters/seccomp-empty.exp | |||
@@ -144,5 +144,6 @@ expect { | |||
144 | } | 144 | } |
145 | sleep 2 | 145 | sleep 2 |
146 | send -- "exit\r" | 146 | send -- "exit\r" |
147 | after 100 | ||
147 | puts "\n" | 148 | puts "\n" |
148 | 149 | ||
diff --git a/test/filters/seccomp-errno.exp b/test/filters/seccomp-errno.exp index aefe816e1..4df1948be 100755 --- a/test/filters/seccomp-errno.exp +++ b/test/filters/seccomp-errno.exp | |||
@@ -86,5 +86,5 @@ sleep 1 | |||
86 | 86 | ||
87 | 87 | ||
88 | send -- "rm seccomp-test-file\r" | 88 | send -- "rm seccomp-test-file\r" |
89 | sleep 1 | 89 | after 100 |
90 | puts "all done\n" | 90 | puts "all done\n" |
diff --git a/test/filters/seccomp-ptrace.exp b/test/filters/seccomp-ptrace.exp index fba9ea92f..bb87b96ea 100755 --- a/test/filters/seccomp-ptrace.exp +++ b/test/filters/seccomp-ptrace.exp | |||
@@ -22,5 +22,5 @@ expect { | |||
22 | } | 22 | } |
23 | 23 | ||
24 | send -- "exit\r" | 24 | send -- "exit\r" |
25 | sleep 1 | 25 | after 100 |
26 | puts "all done\n" | 26 | puts "all done\n" |
diff --git a/test/filters/seccomp-su.exp b/test/filters/seccomp-su.exp index 3f1f2e732..7833c69b0 100755 --- a/test/filters/seccomp-su.exp +++ b/test/filters/seccomp-su.exp | |||
@@ -36,5 +36,5 @@ expect { | |||
36 | } | 36 | } |
37 | 37 | ||
38 | send -- "exit\r" | 38 | send -- "exit\r" |
39 | sleep 1 | 39 | after 100 |
40 | puts "all done\n" | 40 | puts "all done\n" |
diff --git a/test/filters/seccomp-umount.exp b/test/filters/seccomp-umount.exp index 6e2f8c6c2..df38dba5e 100755 --- a/test/filters/seccomp-umount.exp +++ b/test/filters/seccomp-umount.exp | |||
@@ -27,5 +27,5 @@ expect { | |||
27 | } | 27 | } |
28 | 28 | ||
29 | send -- "exit\r" | 29 | send -- "exit\r" |
30 | sleep 1 | 30 | after 100 |
31 | puts "\n" | 31 | puts "\n" |
diff --git a/test/fs/fs_dev_shm.exp b/test/fs/fs_dev_shm.exp index 6d27978e2..8150dfa61 100755 --- a/test/fs/fs_dev_shm.exp +++ b/test/fs/fs_dev_shm.exp | |||
@@ -85,6 +85,6 @@ expect { | |||
85 | "done" | 85 | "done" |
86 | } | 86 | } |
87 | 87 | ||
88 | sleep 1 | 88 | after 100 |
89 | 89 | ||
90 | puts "\nall done\n" | 90 | puts "\nall done\n" |
diff --git a/test/fs/fs_var_lock.exp b/test/fs/fs_var_lock.exp index 0e2b3181a..5879dca52 100755 --- a/test/fs/fs_var_lock.exp +++ b/test/fs/fs_var_lock.exp | |||
@@ -85,6 +85,6 @@ expect { | |||
85 | "done" | 85 | "done" |
86 | } | 86 | } |
87 | 87 | ||
88 | sleep 1 | 88 | after 100 |
89 | 89 | ||
90 | puts "\nall done\n" | 90 | puts "\nall done\n" |
diff --git a/test/fs/fs_var_tmp.exp b/test/fs/fs_var_tmp.exp index 811baac68..a3bc5afe2 100755 --- a/test/fs/fs_var_tmp.exp +++ b/test/fs/fs_var_tmp.exp | |||
@@ -85,6 +85,6 @@ expect { | |||
85 | "done" | 85 | "done" |
86 | } | 86 | } |
87 | 87 | ||
88 | sleep 1 | 88 | after 100 |
89 | 89 | ||
90 | puts "\nall done\n" | 90 | puts "\nall done\n" |
diff --git a/test/fs/option_bind_user.exp b/test/fs/option_bind_user.exp index 9d2d17d7f..a2912968e 100755 --- a/test/fs/option_bind_user.exp +++ b/test/fs/option_bind_user.exp | |||
@@ -9,7 +9,7 @@ expect { | |||
9 | timeout {puts "TESTING ERROR 0\n";exit} | 9 | timeout {puts "TESTING ERROR 0\n";exit} |
10 | "bind option is available only if running as root" | 10 | "bind option is available only if running as root" |
11 | } | 11 | } |
12 | sleep 1 | 12 | after 100 |
13 | 13 | ||
14 | puts "\n" | 14 | puts "\n" |
15 | 15 | ||
diff --git a/test/fs/option_blacklist.exp b/test/fs/option_blacklist.exp index 38fd19237..6554d438f 100755 --- a/test/fs/option_blacklist.exp +++ b/test/fs/option_blacklist.exp | |||
@@ -32,7 +32,7 @@ expect { | |||
32 | timeout {puts "TESTING ERROR 4\n";exit} | 32 | timeout {puts "TESTING ERROR 4\n";exit} |
33 | "done" | 33 | "done" |
34 | } | 34 | } |
35 | sleep 1 | 35 | after 100 |
36 | 36 | ||
37 | puts "\n" | 37 | puts "\n" |
38 | 38 | ||
diff --git a/test/fs/option_blacklist_file.exp b/test/fs/option_blacklist_file.exp index 846735d9e..b0164136c 100755 --- a/test/fs/option_blacklist_file.exp +++ b/test/fs/option_blacklist_file.exp | |||
@@ -20,7 +20,7 @@ expect { | |||
20 | timeout {puts "TESTING ERROR 2\n";exit} | 20 | timeout {puts "TESTING ERROR 2\n";exit} |
21 | "done" | 21 | "done" |
22 | } | 22 | } |
23 | sleep 1 | 23 | after 100 |
24 | 24 | ||
25 | puts "\n" | 25 | puts "\n" |
26 | 26 | ||
diff --git a/test/fs/option_blacklist_glob.exp b/test/fs/option_blacklist_glob.exp index 01939736d..5a96cacc9 100755 --- a/test/fs/option_blacklist_glob.exp +++ b/test/fs/option_blacklist_glob.exp | |||
@@ -27,6 +27,7 @@ expect { | |||
27 | timeout {puts "TESTING ERROR 2\n";exit} | 27 | timeout {puts "TESTING ERROR 2\n";exit} |
28 | "Permission denied" | 28 | "Permission denied" |
29 | } | 29 | } |
30 | after 100 | ||
30 | 31 | ||
31 | puts "\n" | 32 | puts "\n" |
32 | 33 | ||
diff --git a/test/fs/private-bin.exp b/test/fs/private-bin.exp index c19702e77..fe9468be9 100755 --- a/test/fs/private-bin.exp +++ b/test/fs/private-bin.exp | |||
@@ -66,6 +66,6 @@ expect { | |||
66 | } | 66 | } |
67 | send -- "exit\r" | 67 | send -- "exit\r" |
68 | 68 | ||
69 | sleep 1 | 69 | after 100 |
70 | puts "\nall done\n" | 70 | puts "\nall done\n" |
71 | 71 | ||
diff --git a/test/fs/private-etc-empty.exp b/test/fs/private-etc-empty.exp index 13e917a5c..2ab634afd 100755 --- a/test/fs/private-etc-empty.exp +++ b/test/fs/private-etc-empty.exp | |||
@@ -35,4 +35,5 @@ expect { | |||
35 | "0" | 35 | "0" |
36 | } | 36 | } |
37 | 37 | ||
38 | after 100 | ||
38 | puts "\nall done\n" | 39 | puts "\nall done\n" |
diff --git a/test/fs/private-etc.exp b/test/fs/private-etc.exp index 3b4f3eb2b..e692f7382 100755 --- a/test/fs/private-etc.exp +++ b/test/fs/private-etc.exp | |||
@@ -40,6 +40,6 @@ expect { | |||
40 | "done" | 40 | "done" |
41 | } | 41 | } |
42 | 42 | ||
43 | sleep 1 | 43 | after 100 |
44 | puts "\nall done\n" | 44 | puts "\nall done\n" |
45 | 45 | ||
diff --git a/test/fs/private.exp b/test/fs/private.exp index 7eee0c82b..67435b888 100755 --- a/test/fs/private.exp +++ b/test/fs/private.exp | |||
@@ -54,6 +54,6 @@ expect { | |||
54 | timeout {puts "TESTING ERROR 11\n";exit} | 54 | timeout {puts "TESTING ERROR 11\n";exit} |
55 | "done" | 55 | "done" |
56 | } | 56 | } |
57 | sleep 1 | 57 | after 100 |
58 | 58 | ||
59 | puts "all done\n" | 59 | puts "all done\n" |
diff --git a/test/fs/whitelist-double.exp b/test/fs/whitelist-double.exp index 34463dbe4..fc05f9322 100755 --- a/test/fs/whitelist-double.exp +++ b/test/fs/whitelist-double.exp | |||
@@ -37,6 +37,6 @@ expect { | |||
37 | timeout {puts "TESTING ERROR 3\n";exit} | 37 | timeout {puts "TESTING ERROR 3\n";exit} |
38 | "0" | 38 | "0" |
39 | } | 39 | } |
40 | sleep 1 | 40 | after 100 |
41 | 41 | ||
42 | puts "\nall done\n" | 42 | puts "\nall done\n" |
diff --git a/test/fs/whitelist-empty.exp b/test/fs/whitelist-empty.exp index f44d4fb58..71bb8f914 100755 --- a/test/fs/whitelist-empty.exp +++ b/test/fs/whitelist-empty.exp | |||
@@ -49,5 +49,6 @@ expect { | |||
49 | "0" | 49 | "0" |
50 | } | 50 | } |
51 | 51 | ||
52 | after 100 | ||
52 | 53 | ||
53 | puts "\nall done\n" | 54 | puts "\nall done\n" |
diff --git a/test/network/4bridges_arp.exp b/test/network/4bridges_arp.exp index f769df43b..4ffa715cc 100755 --- a/test/network/4bridges_arp.exp +++ b/test/network/4bridges_arp.exp | |||
@@ -167,7 +167,8 @@ expect { | |||
167 | timeout {puts "TESTING ERROR 10.2\n";exit} | 167 | timeout {puts "TESTING ERROR 10.2\n";exit} |
168 | "10.10.50.0/24 dev eth3 proto kernel scope link" | 168 | "10.10.50.0/24 dev eth3 proto kernel scope link" |
169 | } | 169 | } |
170 | sleep 1 | 170 | send -- "exit\r" |
171 | after 100 | ||
171 | 172 | ||
172 | puts "\nall done\n" | 173 | puts "\nall done\n" |
173 | 174 | ||
diff --git a/test/network/4bridges_ip.exp b/test/network/4bridges_ip.exp index db7a61867..3cfd71be0 100755 --- a/test/network/4bridges_ip.exp +++ b/test/network/4bridges_ip.exp | |||
@@ -171,7 +171,8 @@ expect { | |||
171 | "10.10.50.0/24 dev eth3 proto kernel scope link" | 171 | "10.10.50.0/24 dev eth3 proto kernel scope link" |
172 | } | 172 | } |
173 | 173 | ||
174 | sleep 1 | 174 | send -- "exit\r" |
175 | after 100 | ||
175 | 176 | ||
176 | puts "\nall done\n" | 177 | puts "\nall done\n" |
177 | 178 | ||
diff --git a/test/network/bandwidth.exp b/test/network/bandwidth.exp index 2913c6b14..8f3a706a8 100755 --- a/test/network/bandwidth.exp +++ b/test/network/bandwidth.exp | |||
@@ -60,6 +60,6 @@ expect { | |||
60 | "rate 80Kbit burst 10Kb" {puts "TESTING ERROR 9\n";exit} | 60 | "rate 80Kbit burst 10Kb" {puts "TESTING ERROR 9\n";exit} |
61 | "done" | 61 | "done" |
62 | } | 62 | } |
63 | sleep 1 | 63 | after 100 |
64 | 64 | ||
65 | puts "\nall done\n" | 65 | puts "\nall done\n" |
diff --git a/test/network/hostname.exp b/test/network/hostname.exp index 53f24f7b1..73d06725f 100755 --- a/test/network/hostname.exp +++ b/test/network/hostname.exp | |||
@@ -23,6 +23,7 @@ expect { | |||
23 | timeout {puts "TESTING ERROR 3\n";exit} | 23 | timeout {puts "TESTING ERROR 3\n";exit} |
24 | "done" | 24 | "done" |
25 | } | 25 | } |
26 | sleep 1 | 26 | send -- "exit\r" |
27 | after 100 | ||
27 | 28 | ||
28 | puts "all done\n" | 29 | puts "all done\n" |
diff --git a/test/network/ip6.exp b/test/network/ip6.exp index e5939021e..f0fcebcf8 100755 --- a/test/network/ip6.exp +++ b/test/network/ip6.exp | |||
@@ -42,6 +42,8 @@ expect { | |||
42 | "scopeid 0x0<global>" { puts "Arch\n"} | 42 | "scopeid 0x0<global>" { puts "Arch\n"} |
43 | } | 43 | } |
44 | 44 | ||
45 | send -- "exit\r" | ||
46 | after 100 | ||
45 | 47 | ||
46 | puts "\nall done\n" | 48 | puts "\nall done\n" |
47 | 49 | ||
diff --git a/test/network/net_badip.exp b/test/network/net_badip.exp index 8003252d6..d13a6144e 100755 --- a/test/network/net_badip.exp +++ b/test/network/net_badip.exp | |||
@@ -13,7 +13,7 @@ expect { | |||
13 | timeout {puts "TESTING ERROR 0.0\n";exit} | 13 | timeout {puts "TESTING ERROR 0.0\n";exit} |
14 | "the IP address is not" | 14 | "the IP address is not" |
15 | } | 15 | } |
16 | sleep 1 | 16 | after 100 |
17 | 17 | ||
18 | puts "\n" | 18 | puts "\n" |
19 | 19 | ||
diff --git a/test/network/net_defaultgw.exp b/test/network/net_defaultgw.exp index 5534b7706..6291ae5ba 100755 --- a/test/network/net_defaultgw.exp +++ b/test/network/net_defaultgw.exp | |||
@@ -43,7 +43,8 @@ expect { | |||
43 | timeout {puts "TESTING ERROR 10.2\n";exit} | 43 | timeout {puts "TESTING ERROR 10.2\n";exit} |
44 | "10.10.20.0/29 dev eth0 proto kernel scope link" | 44 | "10.10.20.0/29 dev eth0 proto kernel scope link" |
45 | } | 45 | } |
46 | sleep 1 | 46 | send -- "exit\r" |
47 | after 100 | ||
47 | 48 | ||
48 | puts "\nall done\n" | 49 | puts "\nall done\n" |
49 | 50 | ||
diff --git a/test/network/net_defaultgw2.exp b/test/network/net_defaultgw2.exp index 86f204e8c..7620e4899 100755 --- a/test/network/net_defaultgw2.exp +++ b/test/network/net_defaultgw2.exp | |||
@@ -37,7 +37,8 @@ expect { | |||
37 | timeout {puts "TESTING ERROR 10.3\n";exit} | 37 | timeout {puts "TESTING ERROR 10.3\n";exit} |
38 | "10.10.30.0/24 dev eth1 proto kernel scope link" | 38 | "10.10.30.0/24 dev eth1 proto kernel scope link" |
39 | } | 39 | } |
40 | sleep 1 | 40 | send -- "exit\r" |
41 | after 100 | ||
41 | 42 | ||
42 | puts "\nall done\n" | 43 | puts "\nall done\n" |
43 | 44 | ||
diff --git a/test/network/net_defaultgw3.exp b/test/network/net_defaultgw3.exp index 30150938f..a47324adc 100755 --- a/test/network/net_defaultgw3.exp +++ b/test/network/net_defaultgw3.exp | |||
@@ -14,7 +14,8 @@ expect { | |||
14 | "default gateway 10.10.95.89 is not in the range of any network" | 14 | "default gateway 10.10.95.89 is not in the range of any network" |
15 | } | 15 | } |
16 | 16 | ||
17 | sleep 1 | 17 | after 100 |
18 | |||
18 | 19 | ||
19 | puts "\n" | 20 | puts "\n" |
20 | 21 | ||
diff --git a/test/network/net_interface.exp b/test/network/net_interface.exp index 2e6619938..2f87024d8 100755 --- a/test/network/net_interface.exp +++ b/test/network/net_interface.exp | |||
@@ -86,6 +86,8 @@ expect { | |||
86 | timeout {puts "TESTING ERROR 5.1\n";exit} | 86 | timeout {puts "TESTING ERROR 5.1\n";exit} |
87 | "UP" | 87 | "UP" |
88 | } | 88 | } |
89 | send -- "exit\r" | ||
90 | after 100 | ||
89 | 91 | ||
90 | puts "all done\n" | 92 | puts "all done\n" |
91 | 93 | ||
diff --git a/test/network/net_ip.exp b/test/network/net_ip.exp index 0eff212dd..32103050d 100755 --- a/test/network/net_ip.exp +++ b/test/network/net_ip.exp | |||
@@ -69,7 +69,8 @@ expect { | |||
69 | timeout {puts "TESTING ERROR 10\n";exit} | 69 | timeout {puts "TESTING ERROR 10\n";exit} |
70 | "10.10.20.0/29 dev eth0 proto kernel scope link" | 70 | "10.10.20.0/29 dev eth0 proto kernel scope link" |
71 | } | 71 | } |
72 | sleep 1 | 72 | send -- "exit\r" |
73 | after 100 | ||
73 | 74 | ||
74 | puts "\n" | 75 | puts "\n" |
75 | 76 | ||
diff --git a/test/network/net_local.exp b/test/network/net_local.exp index 60ab2af05..b72b9adaf 100755 --- a/test/network/net_local.exp +++ b/test/network/net_local.exp | |||
@@ -43,6 +43,8 @@ expect { | |||
43 | timeout {puts "TESTING ERROR 7\n";exit} | 43 | timeout {puts "TESTING ERROR 7\n";exit} |
44 | "255.0.0.0" | 44 | "255.0.0.0" |
45 | } | 45 | } |
46 | send -- "exit\r" | ||
47 | after 100 | ||
46 | 48 | ||
47 | puts "all done\n" | 49 | puts "all done\n" |
48 | 50 | ||
diff --git a/test/network/net_mac.exp b/test/network/net_mac.exp index 5c48be9fd..d3cd8163f 100755 --- a/test/network/net_mac.exp +++ b/test/network/net_mac.exp | |||
@@ -33,7 +33,8 @@ expect { | |||
33 | timeout {puts "TESTING ERROR 4\n";exit} | 33 | timeout {puts "TESTING ERROR 4\n";exit} |
34 | "Child process initialized" | 34 | "Child process initialized" |
35 | } | 35 | } |
36 | sleep 1 | 36 | send -- "exit\r" |
37 | after 100 | ||
37 | 38 | ||
38 | puts "\nall done\n" | 39 | puts "\nall done\n" |
39 | 40 | ||
diff --git a/test/network/net_macvlan.exp b/test/network/net_macvlan.exp index ca503c26a..f457ea98f 100755 --- a/test/network/net_macvlan.exp +++ b/test/network/net_macvlan.exp | |||
@@ -86,6 +86,8 @@ while { $i <= $MAXi } { | |||
86 | after 100 | 86 | after 100 |
87 | # sleep 1 | 87 | # sleep 1 |
88 | } | 88 | } |
89 | send -- "exit\r" | ||
90 | after 100 | ||
89 | 91 | ||
90 | puts "\n" | 92 | puts "\n" |
91 | 93 | ||
diff --git a/test/network/net_mtu.exp b/test/network/net_mtu.exp index 21b9aa5cb..eb9c5d08c 100755 --- a/test/network/net_mtu.exp +++ b/test/network/net_mtu.exp | |||
@@ -28,6 +28,8 @@ expect { | |||
28 | timeout {puts "TESTING ERROR 4\n";exit} | 28 | timeout {puts "TESTING ERROR 4\n";exit} |
29 | "state UP" | 29 | "state UP" |
30 | } | 30 | } |
31 | send -- "exit\r" | ||
32 | after 100 | ||
31 | 33 | ||
32 | puts "\nall done\n" | 34 | puts "\nall done\n" |
33 | 35 | ||
diff --git a/test/network/net_noip.exp b/test/network/net_noip.exp index 3fb53d860..b557d116c 100755 --- a/test/network/net_noip.exp +++ b/test/network/net_noip.exp | |||
@@ -38,6 +38,7 @@ expect { | |||
38 | timeout {puts "TESTING ERROR 6\n";exit} | 38 | timeout {puts "TESTING ERROR 6\n";exit} |
39 | "done" | 39 | "done" |
40 | } | 40 | } |
41 | send -- "exit\r" | ||
41 | after 100 | 42 | after 100 |
42 | 43 | ||
43 | puts "all done\n" | 44 | puts "all done\n" |
diff --git a/test/network/net_noip2.exp b/test/network/net_noip2.exp index cf86d7f6b..c86ea4900 100755 --- a/test/network/net_noip2.exp +++ b/test/network/net_noip2.exp | |||
@@ -38,6 +38,7 @@ expect { | |||
38 | timeout {puts "TESTING ERROR 6\n";exit} | 38 | timeout {puts "TESTING ERROR 6\n";exit} |
39 | "done" | 39 | "done" |
40 | } | 40 | } |
41 | send -- "exit\r" | ||
41 | after 100 | 42 | after 100 |
42 | 43 | ||
43 | puts "all done\n" | 44 | puts "all done\n" |
diff --git a/test/network/net_none.exp b/test/network/net_none.exp index 1c1577d76..1761eb423 100755 --- a/test/network/net_none.exp +++ b/test/network/net_none.exp | |||
@@ -66,6 +66,7 @@ expect { | |||
66 | "eth0" {puts "TESTING ERROR 5.1\n";exit} | 66 | "eth0" {puts "TESTING ERROR 5.1\n";exit} |
67 | "done" | 67 | "done" |
68 | } | 68 | } |
69 | sleep 1 | 69 | send -- "exit\r" |
70 | after 100 | ||
70 | 71 | ||
71 | puts "\nall done\n" | 72 | puts "\nall done\n" |
diff --git a/test/network/net_profile.exp b/test/network/net_profile.exp index 7e88193cc..dee0b2793 100755 --- a/test/network/net_profile.exp +++ b/test/network/net_profile.exp | |||
@@ -70,7 +70,8 @@ expect { | |||
70 | "state UP" | 70 | "state UP" |
71 | } | 71 | } |
72 | 72 | ||
73 | sleep 1 | 73 | send -- "exit\r" |
74 | after 100 | ||
74 | 75 | ||
75 | puts "\nall done\n" | 76 | puts "\nall done\n" |
76 | 77 | ||
diff --git a/test/profiles/ignore.exp b/test/profiles/ignore.exp index 281697b26..0c5691e9a 100755 --- a/test/profiles/ignore.exp +++ b/test/profiles/ignore.exp | |||
@@ -46,5 +46,5 @@ expect { | |||
46 | "Child process initialized" | 46 | "Child process initialized" |
47 | } | 47 | } |
48 | 48 | ||
49 | 49 | after 100 | |
50 | puts "\nall done\n" | 50 | puts "\nall done\n" |
diff --git a/test/profiles/profile_followlnk.exp b/test/profiles/profile_followlnk.exp index 4d89de26b..eb3d04852 100755 --- a/test/profiles/profile_followlnk.exp +++ b/test/profiles/profile_followlnk.exp | |||
@@ -31,7 +31,8 @@ expect { | |||
31 | sleep 1 | 31 | sleep 1 |
32 | 32 | ||
33 | send -- "exit\r" | 33 | send -- "exit\r" |
34 | after 100 | ||
34 | send -- "rm -fr /tmp/firejailtest*\r" | 35 | send -- "rm -fr /tmp/firejailtest*\r" |
35 | sleep 1 | 36 | after 100 |
36 | 37 | ||
37 | puts "\nall done\n" | 38 | puts "\nall done\n" |
diff --git a/test/profiles/profile_noperm.exp b/test/profiles/profile_noperm.exp index 25ec580bd..b3b031cb2 100755 --- a/test/profiles/profile_noperm.exp +++ b/test/profiles/profile_noperm.exp | |||
@@ -9,5 +9,5 @@ expect { | |||
9 | timeout {puts "TESTING ERROR 0\n";exit} | 9 | timeout {puts "TESTING ERROR 0\n";exit} |
10 | "cannot access profile" | 10 | "cannot access profile" |
11 | } | 11 | } |
12 | sleep 1 | 12 | after 100 |
13 | puts "\nall done\n" | 13 | puts "\nall done\n" |
diff --git a/test/profiles/profile_readonly.exp b/test/profiles/profile_readonly.exp index e8e78d6ad..c1c9544a6 100755 --- a/test/profiles/profile_readonly.exp +++ b/test/profiles/profile_readonly.exp | |||
@@ -28,9 +28,9 @@ expect { | |||
28 | "Read-only file system" | 28 | "Read-only file system" |
29 | } | 29 | } |
30 | send -- "exit\r" | 30 | send -- "exit\r" |
31 | sleep 1 | 31 | after 100 |
32 | 32 | ||
33 | send -- "rm -fr /tmp/firejailtest*\r" | 33 | send -- "rm -fr /tmp/firejailtest*\r" |
34 | sleep 1 | 34 | after 100 |
35 | 35 | ||
36 | puts "\nall done\n" | 36 | puts "\nall done\n" |
diff --git a/test/profiles/profile_syntax.exp b/test/profiles/profile_syntax.exp index dd6b637ed..c8cb99a5f 100755 --- a/test/profiles/profile_syntax.exp +++ b/test/profiles/profile_syntax.exp | |||
@@ -50,5 +50,5 @@ expect { | |||
50 | } | 50 | } |
51 | send -- "exit\r" | 51 | send -- "exit\r" |
52 | 52 | ||
53 | sleep 1 | 53 | after 100 |
54 | puts "\nall done\n" | 54 | puts "\nall done\n" |
diff --git a/test/profiles/profile_syntax2.exp b/test/profiles/profile_syntax2.exp index ba83731be..9dca35ca2 100755 --- a/test/profiles/profile_syntax2.exp +++ b/test/profiles/profile_syntax2.exp | |||
@@ -45,6 +45,6 @@ expect { | |||
45 | timeout {puts "TESTING ERROR 8\n";exit} | 45 | timeout {puts "TESTING ERROR 8\n";exit} |
46 | "Child process initialized" | 46 | "Child process initialized" |
47 | } | 47 | } |
48 | 48 | send -- "exit\r" | |
49 | sleep 1 | 49 | after 100 |
50 | puts "\nall done\n" | 50 | puts "\nall done\n" |
diff --git a/test/utils/caps-print.exp b/test/utils/caps-print.exp index 9cc4b1872..fa5239da2 100755 --- a/test/utils/caps-print.exp +++ b/test/utils/caps-print.exp | |||
@@ -28,5 +28,5 @@ expect { | |||
28 | timeout {puts "TESTING ERROR 3\n";exit} | 28 | timeout {puts "TESTING ERROR 3\n";exit} |
29 | "net_raw - disabled" | 29 | "net_raw - disabled" |
30 | } | 30 | } |
31 | sleep 1 | 31 | after 100 |
32 | puts "\nall done\n" | 32 | puts "\nall done\n" |
diff --git a/test/utils/cpu-print.exp b/test/utils/cpu-print.exp index 4a9ffa0ac..ca2e57313 100755 --- a/test/utils/cpu-print.exp +++ b/test/utils/cpu-print.exp | |||
@@ -20,5 +20,5 @@ expect { | |||
20 | timeout {puts "TESTING ERROR 1\n";exit} | 20 | timeout {puts "TESTING ERROR 1\n";exit} |
21 | "Cpus_allowed_list: 1-2" | 21 | "Cpus_allowed_list: 1-2" |
22 | } | 22 | } |
23 | sleep 1 | 23 | after 100 |
24 | puts "\nall done\n" | 24 | puts "\nall done\n" |
diff --git a/test/utils/dns-print.exp b/test/utils/dns-print.exp index 51dcab508..406ab5149 100755 --- a/test/utils/dns-print.exp +++ b/test/utils/dns-print.exp | |||
@@ -20,5 +20,5 @@ expect { | |||
20 | timeout {puts "TESTING ERROR 1\n";exit} | 20 | timeout {puts "TESTING ERROR 1\n";exit} |
21 | "nameserver 1.2.3.4" | 21 | "nameserver 1.2.3.4" |
22 | } | 22 | } |
23 | sleep 1 | 23 | after 100 |
24 | puts "\nall done\n" | 24 | puts "\nall done\n" |
diff --git a/test/utils/fs-print.exp b/test/utils/fs-print.exp index fa0eab95b..4d4ceb718 100755 --- a/test/utils/fs-print.exp +++ b/test/utils/fs-print.exp | |||
@@ -28,5 +28,5 @@ expect { | |||
28 | timeout {puts "TESTING ERROR 3\n";exit} | 28 | timeout {puts "TESTING ERROR 3\n";exit} |
29 | "blacklist /proc/kmsg" | 29 | "blacklist /proc/kmsg" |
30 | } | 30 | } |
31 | sleep 1 | 31 | after 100 |
32 | puts "\nall done\n" | 32 | puts "\nall done\n" |
diff --git a/test/utils/join-profile.exp b/test/utils/join-profile.exp index a4262b999..a2078c2f6 100755 --- a/test/utils/join-profile.exp +++ b/test/utils/join-profile.exp | |||
@@ -30,6 +30,6 @@ expect { | |||
30 | } | 30 | } |
31 | 31 | ||
32 | send -- "exit" | 32 | send -- "exit" |
33 | sleep 1 | 33 | after 100 |
34 | 34 | ||
35 | puts "\nall done\n" | 35 | puts "\nall done\n" |
diff --git a/test/utils/join.exp b/test/utils/join.exp index ab4917f7d..7f582e2e5 100755 --- a/test/utils/join.exp +++ b/test/utils/join.exp | |||
@@ -33,6 +33,6 @@ expect { | |||
33 | } | 33 | } |
34 | 34 | ||
35 | send -- "exit" | 35 | send -- "exit" |
36 | sleep 1 | 36 | after 100 |
37 | 37 | ||
38 | puts "\nall done\n" | 38 | puts "\nall done\n" |
diff --git a/test/utils/join2.exp b/test/utils/join2.exp index 82540fe39..5895eb730 100755 --- a/test/utils/join2.exp +++ b/test/utils/join2.exp | |||
@@ -33,6 +33,6 @@ expect { | |||
33 | } | 33 | } |
34 | 34 | ||
35 | send -- "exit" | 35 | send -- "exit" |
36 | sleep 1 | 36 | after 100 |
37 | 37 | ||
38 | puts "\nall done\n" | 38 | puts "\nall done\n" |
diff --git a/test/utils/join3.exp b/test/utils/join3.exp index e92045dd1..3ccc47bf9 100755 --- a/test/utils/join3.exp +++ b/test/utils/join3.exp | |||
@@ -33,6 +33,6 @@ expect { | |||
33 | } | 33 | } |
34 | 34 | ||
35 | send -- "exit" | 35 | send -- "exit" |
36 | sleep 1 | 36 | after 100 |
37 | 37 | ||
38 | puts "\nall done\n" | 38 | puts "\nall done\n" |
diff --git a/test/utils/ls.exp b/test/utils/ls.exp index 3a99be0d5..b83957a4f 100755 --- a/test/utils/ls.exp +++ b/test/utils/ls.exp | |||
@@ -37,5 +37,5 @@ expect { | |||
37 | sleep 1 | 37 | sleep 1 |
38 | send -- "rm -f lstesting\r" | 38 | send -- "rm -f lstesting\r" |
39 | 39 | ||
40 | sleep 1 | 40 | after 100 |
41 | puts "\nall done\n" | 41 | puts "\nall done\n" |
diff --git a/test/utils/protocol-print.exp b/test/utils/protocol-print.exp index 152a64467..b4b94ea93 100755 --- a/test/utils/protocol-print.exp +++ b/test/utils/protocol-print.exp | |||
@@ -20,5 +20,5 @@ expect { | |||
20 | timeout {puts "TESTING ERROR 1\n";exit} | 20 | timeout {puts "TESTING ERROR 1\n";exit} |
21 | "unix,inet,inet6" | 21 | "unix,inet,inet6" |
22 | } | 22 | } |
23 | sleep 1 | 23 | after 100 |
24 | puts "\nall done\n" | 24 | puts "\nall done\n" |
diff --git a/test/utils/seccomp-print.exp b/test/utils/seccomp-print.exp index d0531a9c3..f6ff1e721 100755 --- a/test/utils/seccomp-print.exp +++ b/test/utils/seccomp-print.exp | |||
@@ -32,5 +32,5 @@ expect { | |||
32 | timeout {puts "TESTING ERROR 4\n";exit} | 32 | timeout {puts "TESTING ERROR 4\n";exit} |
33 | "RETURN_ALLOW" | 33 | "RETURN_ALLOW" |
34 | } | 34 | } |
35 | sleep 1 | 35 | after 100 |
36 | puts "\nall done\n" | 36 | puts "\nall done\n" |
diff --git a/test/utils/shutdown2.exp b/test/utils/shutdown2.exp index 7857b919c..777a73ec9 100755 --- a/test/utils/shutdown2.exp +++ b/test/utils/shutdown2.exp | |||
@@ -40,6 +40,6 @@ expect { | |||
40 | timeout {puts "TESTING ERROR 5\n";exit} | 40 | timeout {puts "TESTING ERROR 5\n";exit} |
41 | "5" | 41 | "5" |
42 | } | 42 | } |
43 | sleep 1 | 43 | after 100 |
44 | 44 | ||
45 | puts "\nalldone\n" | 45 | puts "\nalldone\n" |
diff --git a/test/utils/shutdown3.exp b/test/utils/shutdown3.exp index 02b68c4ce..a74fb3386 100755 --- a/test/utils/shutdown3.exp +++ b/test/utils/shutdown3.exp | |||
@@ -60,6 +60,6 @@ expect { | |||
60 | timeout {puts "TESTING ERROR 10\n";exit} | 60 | timeout {puts "TESTING ERROR 10\n";exit} |
61 | "5" | 61 | "5" |
62 | } | 62 | } |
63 | sleep 1 | 63 | after 100 |
64 | 64 | ||
65 | puts "\nalldone\n" | 65 | puts "\nalldone\n" |
diff --git a/test/utils/shutdown4.exp b/test/utils/shutdown4.exp index 0f2e0e7fe..2942ba3d5 100755 --- a/test/utils/shutdown4.exp +++ b/test/utils/shutdown4.exp | |||
@@ -60,6 +60,6 @@ expect { | |||
60 | timeout {puts "TESTING ERROR 50\n";exit} | 60 | timeout {puts "TESTING ERROR 50\n";exit} |
61 | "50" | 61 | "50" |
62 | } | 62 | } |
63 | sleep 1 | 63 | after 100 |
64 | 64 | ||
65 | puts "\nalldone\n" | 65 | puts "\nalldone\n" |
diff --git a/test/utils/trace.exp b/test/utils/trace.exp index b562a6b49..78a04b273 100755 --- a/test/utils/trace.exp +++ b/test/utils/trace.exp | |||
@@ -110,5 +110,6 @@ expect { | |||
110 | "bash:access /etc/terminfo/" {puts "debian\n"} | 110 | "bash:access /etc/terminfo/" {puts "debian\n"} |
111 | "bash:access /usr/share/terminfo/" {puts "arch\n"} | 111 | "bash:access /usr/share/terminfo/" {puts "arch\n"} |
112 | } | 112 | } |
113 | after 100 | ||
113 | 114 | ||
114 | puts "\nall done\n" | 115 | puts "\nall done\n" |