diff options
Diffstat (limited to 'test/environment')
-rwxr-xr-x | test/environment/allow-debuggers.exp | 2 | ||||
-rwxr-xr-x | test/environment/csh.exp | 2 | ||||
-rwxr-xr-x | test/environment/dash.exp | 2 | ||||
-rwxr-xr-x | test/environment/deterministic-exit-code.exp | 4 | ||||
-rwxr-xr-x | test/environment/dns.exp | 8 | ||||
-rwxr-xr-x | test/environment/doubledash.exp | 4 | ||||
-rwxr-xr-x | test/environment/env.exp | 4 | ||||
-rwxr-xr-x | test/environment/extract_command.exp | 2 | ||||
-rwxr-xr-x | test/environment/firejail-in-firejail.exp | 2 | ||||
-rwxr-xr-x | test/environment/hostfile.exp | 2 | ||||
-rwxr-xr-x | test/environment/ibus.exp | 2 | ||||
-rwxr-xr-x | test/environment/keep-fd.exp | 10 | ||||
-rwxr-xr-x | test/environment/machineid.exp | 2 | ||||
-rwxr-xr-x | test/environment/nice.exp | 6 | ||||
-rwxr-xr-x | test/environment/rlimit-join.exp | 8 | ||||
-rwxr-xr-x | test/environment/rlimit-profile.exp | 2 | ||||
-rwxr-xr-x | test/environment/rlimit.exp | 2 | ||||
-rwxr-xr-x | test/environment/shell-none.exp | 4 | ||||
-rwxr-xr-x | test/environment/sound.exp | 10 | ||||
-rwxr-xr-x | test/environment/timeout.exp | 2 | ||||
-rwxr-xr-x | test/environment/umask.exp | 2 | ||||
-rwxr-xr-x | test/environment/zsh.exp | 2 |
22 files changed, 44 insertions, 40 deletions
diff --git a/test/environment/allow-debuggers.exp b/test/environment/allow-debuggers.exp index 412e24e9b..f972b5788 100755 --- a/test/environment/allow-debuggers.exp +++ b/test/environment/allow-debuggers.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --allow-debuggers\r" | 11 | send -- "firejail --allow-debuggers\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
14 | "Child process initialized" { puts "\n"} | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" { puts "\n"} |
15 | "is disabled on Linux kernels prior to 4.8" { puts "TESTING SKIP: kernel too old\n"; exit } | 15 | "is disabled on Linux kernels prior to 4.8" { puts "TESTING SKIP: kernel too old\n"; exit } |
16 | } | 16 | } |
17 | after 100 | 17 | after 100 |
diff --git a/test/environment/csh.exp b/test/environment/csh.exp index eedb1bab7..31bfbfa40 100755 --- a/test/environment/csh.exp +++ b/test/environment/csh.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --private --shell=/bin/csh\r" | 11 | send -- "firejail --private --shell=/bin/csh\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
14 | "Child process initialized" | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
15 | } | 15 | } |
16 | sleep 1 | 16 | sleep 1 |
17 | 17 | ||
diff --git a/test/environment/dash.exp b/test/environment/dash.exp index c2ece31f0..4dd5cac9f 100755 --- a/test/environment/dash.exp +++ b/test/environment/dash.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --private --tracelog --shell=/bin/dash\r" | 11 | send -- "firejail --private --tracelog --shell=/bin/dash\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
14 | "Child process initialized" | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
15 | } | 15 | } |
16 | sleep 1 | 16 | sleep 1 |
17 | 17 | ||
diff --git a/test/environment/deterministic-exit-code.exp b/test/environment/deterministic-exit-code.exp index d7585c401..9f5be2c3d 100755 --- a/test/environment/deterministic-exit-code.exp +++ b/test/environment/deterministic-exit-code.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail\r" | 10 | send -- "firejail\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -32,7 +32,7 @@ after 100 | |||
32 | send -- "firejail --deterministic-exit-code\r" | 32 | send -- "firejail --deterministic-exit-code\r" |
33 | expect { | 33 | expect { |
34 | timeout {puts "TESTING ERROR 3\n";exit} | 34 | timeout {puts "TESTING ERROR 3\n";exit} |
35 | "Child process initialized" | 35 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
36 | } | 36 | } |
37 | sleep 1 | 37 | sleep 1 |
38 | 38 | ||
diff --git a/test/environment/dns.exp b/test/environment/dns.exp index 1fe6449b7..b5a8c119b 100755 --- a/test/environment/dns.exp +++ b/test/environment/dns.exp | |||
@@ -30,7 +30,7 @@ expect { | |||
30 | } | 30 | } |
31 | expect { | 31 | expect { |
32 | timeout {puts "TESTING ERROR 1.5\n";exit} | 32 | timeout {puts "TESTING ERROR 1.5\n";exit} |
33 | "Child process initialized" | 33 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
34 | } | 34 | } |
35 | expect { | 35 | expect { |
36 | timeout {puts "TESTING ERROR 1.6\n";exit} | 36 | timeout {puts "TESTING ERROR 1.6\n";exit} |
@@ -47,7 +47,7 @@ expect { | |||
47 | "DNS server 8.8.8.8" {puts "TESTING ERROR 2.3\n";exit} | 47 | "DNS server 8.8.8.8" {puts "TESTING ERROR 2.3\n";exit} |
48 | "DNS server 4.2.2.1" {puts "TESTING ERROR 2.4\n";exit} | 48 | "DNS server 4.2.2.1" {puts "TESTING ERROR 2.4\n";exit} |
49 | "DNS server ::2" {puts "TESTING ERROR 2.5\n";exit} | 49 | "DNS server ::2" {puts "TESTING ERROR 2.5\n";exit} |
50 | "Child process initialized" {puts "TESTING ERROR 2.6\n";exit} | 50 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "TESTING ERROR 2.6\n";exit} |
51 | "Parent is shutting down, bye..." {puts "TESTING ERROR 2.7\n";exit} | 51 | "Parent is shutting down, bye..." {puts "TESTING ERROR 2.7\n";exit} |
52 | "root" | 52 | "root" |
53 | } | 53 | } |
@@ -56,7 +56,7 @@ after 100 | |||
56 | send -- "firejail --dns=8.8.4.4 --dns=8.8.8.8 --dns=4.2.2.1 --dns=::2\r" | 56 | send -- "firejail --dns=8.8.4.4 --dns=8.8.8.8 --dns=4.2.2.1 --dns=::2\r" |
57 | expect { | 57 | expect { |
58 | timeout {puts "TESTING ERROR 3\n";exit} | 58 | timeout {puts "TESTING ERROR 3\n";exit} |
59 | "Child process initialized" | 59 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
60 | } | 60 | } |
61 | sleep 1 | 61 | sleep 1 |
62 | 62 | ||
@@ -85,7 +85,7 @@ sleep 1 | |||
85 | send -- "firejail --profile=dns.profile\r" | 85 | send -- "firejail --profile=dns.profile\r" |
86 | expect { | 86 | expect { |
87 | timeout {puts "TESTING ERROR 5.1\n";exit} | 87 | timeout {puts "TESTING ERROR 5.1\n";exit} |
88 | "Child process initialized" | 88 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
89 | } | 89 | } |
90 | sleep 1 | 90 | sleep 1 |
91 | 91 | ||
diff --git a/test/environment/doubledash.exp b/test/environment/doubledash.exp index 1a9ecebe1..dd2725426 100755 --- a/test/environment/doubledash.exp +++ b/test/environment/doubledash.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail -- ls -- -testdir\r" | 10 | send -- "firejail -- ls -- -testdir\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | expect { | 15 | expect { |
16 | timeout {puts "TESTING ERROR 2\n";exit} | 16 | timeout {puts "TESTING ERROR 2\n";exit} |
@@ -26,7 +26,7 @@ sleep 1 | |||
26 | send -- "firejail --name=testing -- -testdir/bash\r" | 26 | send -- "firejail --name=testing -- -testdir/bash\r" |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 4\n";exit} | 28 | timeout {puts "TESTING ERROR 4\n";exit} |
29 | "Child process initialized" | 29 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
30 | } | 30 | } |
31 | sleep 3 | 31 | sleep 3 |
32 | 32 | ||
diff --git a/test/environment/env.exp b/test/environment/env.exp index b5ebe883c..9394f2066 100755 --- a/test/environment/env.exp +++ b/test/environment/env.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --env=ENV1=env1 --env=ENV2=env2 --env=ENV3=env3\r" | 11 | send -- "firejail --env=ENV1=env1 --env=ENV2=env2 --env=ENV3=env3\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
14 | "Child process initialized" | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
15 | } | 15 | } |
16 | sleep 1 | 16 | sleep 1 |
17 | 17 | ||
@@ -37,7 +37,7 @@ after 100 | |||
37 | send -- "firejail --profile=env.profile\r" | 37 | send -- "firejail --profile=env.profile\r" |
38 | expect { | 38 | expect { |
39 | timeout {puts "TESTING ERROR 4\n";exit} | 39 | timeout {puts "TESTING ERROR 4\n";exit} |
40 | "Child process initialized" | 40 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
41 | } | 41 | } |
42 | sleep 1 | 42 | sleep 1 |
43 | send -- "env | grep LD_LIBRARY_PATH\r" | 43 | send -- "env | grep LD_LIBRARY_PATH\r" |
diff --git a/test/environment/extract_command.exp b/test/environment/extract_command.exp index e719e6658..45ff1f291 100755 --- a/test/environment/extract_command.exp +++ b/test/environment/extract_command.exp | |||
@@ -14,7 +14,7 @@ expect { | |||
14 | } | 14 | } |
15 | expect { | 15 | expect { |
16 | timeout {puts "TESTING ERROR 2\n";exit} | 16 | timeout {puts "TESTING ERROR 2\n";exit} |
17 | "Child process initialized" | 17 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
18 | } | 18 | } |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 2\n";exit} | 20 | timeout {puts "TESTING ERROR 2\n";exit} |
diff --git a/test/environment/firejail-in-firejail.exp b/test/environment/firejail-in-firejail.exp index 10d5c9074..4a60d5611 100755 --- a/test/environment/firejail-in-firejail.exp +++ b/test/environment/firejail-in-firejail.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail\r" | 10 | send -- "firejail\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/environment/hostfile.exp b/test/environment/hostfile.exp index 709eb5d36..ccc8d049e 100755 --- a/test/environment/hostfile.exp +++ b/test/environment/hostfile.exp | |||
@@ -15,7 +15,7 @@ expect { | |||
15 | } | 15 | } |
16 | expect { | 16 | expect { |
17 | timeout {puts "TESTING ERROR 2\n";exit} | 17 | timeout {puts "TESTING ERROR 2\n";exit} |
18 | "Child process initialized" | 18 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
19 | } | 19 | } |
20 | after 100 | 20 | after 100 |
21 | 21 | ||
diff --git a/test/environment/ibus.exp b/test/environment/ibus.exp index e6095dc44..e9dd290a1 100755 --- a/test/environment/ibus.exp +++ b/test/environment/ibus.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail\r" | 11 | send -- "firejail\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
14 | "Child process initialized" | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
15 | } | 15 | } |
16 | after 100 | 16 | after 100 |
17 | 17 | ||
diff --git a/test/environment/keep-fd.exp b/test/environment/keep-fd.exp index 222234ceb..440cbd860 100755 --- a/test/environment/keep-fd.exp +++ b/test/environment/keep-fd.exp | |||
@@ -47,7 +47,7 @@ after 100 | |||
47 | send -- "firejail --noprofile\r" | 47 | send -- "firejail --noprofile\r" |
48 | expect { | 48 | expect { |
49 | timeout {puts "TESTING ERROR 2\n";exit} | 49 | timeout {puts "TESTING ERROR 2\n";exit} |
50 | "Child process initialized" | 50 | -re {Child process initialized in [0-9]+.[0-9]+ ms} |
51 | } | 51 | } |
52 | after 100 | 52 | after 100 |
53 | 53 | ||
@@ -83,7 +83,7 @@ after 500 | |||
83 | send -- "firejail --noprofile --keep-fd=\$READ_FD\r" | 83 | send -- "firejail --noprofile --keep-fd=\$READ_FD\r" |
84 | expect { | 84 | expect { |
85 | timeout {puts "TESTING ERROR 6\n";exit} | 85 | timeout {puts "TESTING ERROR 6\n";exit} |
86 | "Child process initialized" | 86 | -re {Child process initialized in [0-9]+.[0-9]+ ms} |
87 | } | 87 | } |
88 | after 100 | 88 | after 100 |
89 | 89 | ||
@@ -119,7 +119,7 @@ after 500 | |||
119 | send -- "firejail --noprofile --keep-fd=\$WRITE_FD\r" | 119 | send -- "firejail --noprofile --keep-fd=\$WRITE_FD\r" |
120 | expect { | 120 | expect { |
121 | timeout {puts "TESTING ERROR 10\n";exit} | 121 | timeout {puts "TESTING ERROR 10\n";exit} |
122 | "Child process initialized" | 122 | -re {Child process initialized in [0-9]+.[0-9]+ ms} |
123 | } | 123 | } |
124 | after 100 | 124 | after 100 |
125 | 125 | ||
@@ -155,7 +155,7 @@ after 500 | |||
155 | send -- "firejail --noprofile --keep-fd=\$READ_FD,\$WRITE_FD\r" | 155 | send -- "firejail --noprofile --keep-fd=\$READ_FD,\$WRITE_FD\r" |
156 | expect { | 156 | expect { |
157 | timeout {puts "TESTING ERROR 14\n";exit} | 157 | timeout {puts "TESTING ERROR 14\n";exit} |
158 | "Child process initialized" | 158 | -re {Child process initialized in [0-9]+.[0-9]+ ms} |
159 | } | 159 | } |
160 | after 100 | 160 | after 100 |
161 | 161 | ||
@@ -191,7 +191,7 @@ after 500 | |||
191 | send -- "firejail --noprofile --keep-fd=all\r" | 191 | send -- "firejail --noprofile --keep-fd=all\r" |
192 | expect { | 192 | expect { |
193 | timeout {puts "TESTING ERROR 18\n";exit} | 193 | timeout {puts "TESTING ERROR 18\n";exit} |
194 | "Child process initialized" | 194 | -re {Child process initialized in [0-9]+.[0-9]+ ms} |
195 | } | 195 | } |
196 | after 100 | 196 | after 100 |
197 | 197 | ||
diff --git a/test/environment/machineid.exp b/test/environment/machineid.exp index b7eb5c911..2392dc9d6 100755 --- a/test/environment/machineid.exp +++ b/test/environment/machineid.exp | |||
@@ -15,7 +15,7 @@ expect { | |||
15 | } | 15 | } |
16 | expect { | 16 | expect { |
17 | timeout {puts "TESTING ERROR 1\n";exit} | 17 | timeout {puts "TESTING ERROR 1\n";exit} |
18 | "Child process initialized" | 18 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
19 | } | 19 | } |
20 | after 100 | 20 | after 100 |
21 | send -- "exit\r" | 21 | send -- "exit\r" |
diff --git a/test/environment/nice.exp b/test/environment/nice.exp index 69e641448..823d10c67 100755 --- a/test/environment/nice.exp +++ b/test/environment/nice.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --nice=15\r" | 10 | send -- "firejail --nice=15\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -39,7 +39,7 @@ after 100 | |||
39 | send -- "firejail --profile=nice.profile\r" | 39 | send -- "firejail --profile=nice.profile\r" |
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 10\n";exit} | 41 | timeout {puts "TESTING ERROR 10\n";exit} |
42 | "Child process initialized" | 42 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
43 | } | 43 | } |
44 | sleep 1 | 44 | sleep 1 |
45 | 45 | ||
@@ -70,7 +70,7 @@ after 100 | |||
70 | send -- "firejail --nice=-5\r" | 70 | send -- "firejail --nice=-5\r" |
71 | expect { | 71 | expect { |
72 | timeout {puts "TESTING ERROR 17\n";exit} | 72 | timeout {puts "TESTING ERROR 17\n";exit} |
73 | "Child process initialized" | 73 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
74 | } | 74 | } |
75 | sleep 1 | 75 | sleep 1 |
76 | 76 | ||
diff --git a/test/environment/rlimit-join.exp b/test/environment/rlimit-join.exp index 42a8df390..9e7161241 100755 --- a/test/environment/rlimit-join.exp +++ b/test/environment/rlimit-join.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --noprofile --name=\"rlimit testing\"\r" | 11 | send -- "firejail --noprofile --name=\"rlimit testing\"\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
14 | "Child process initialized" | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
15 | } | 15 | } |
16 | sleep 1 | 16 | sleep 1 |
17 | 17 | ||
@@ -21,11 +21,15 @@ expect { | |||
21 | timeout {puts "TESTING ERROR 1\n";exit} | 21 | timeout {puts "TESTING ERROR 1\n";exit} |
22 | "Switching to pid" | 22 | "Switching to pid" |
23 | } | 23 | } |
24 | expect { | ||
25 | timeout {puts "TESTING ERROR 2\n";exit} | ||
26 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" | ||
27 | } | ||
24 | sleep 1 | 28 | sleep 1 |
25 | 29 | ||
26 | send -- "cat /proc/self/limits\r" | 30 | send -- "cat /proc/self/limits\r" |
27 | expect { | 31 | expect { |
28 | timeout {puts "TESTING ERROR 2\n";exit} | 32 | timeout {puts "TESTING ERROR 3\n";exit} |
29 | "Max open files 1234 1234" | 33 | "Max open files 1234 1234" |
30 | } | 34 | } |
31 | after 100 | 35 | after 100 |
diff --git a/test/environment/rlimit-profile.exp b/test/environment/rlimit-profile.exp index d0365d5e3..762f70ba9 100755 --- a/test/environment/rlimit-profile.exp +++ b/test/environment/rlimit-profile.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --profile=rlimit.profile\r" | 11 | send -- "firejail --profile=rlimit.profile\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
14 | "Child process initialized" | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
15 | } | 15 | } |
16 | sleep 1 | 16 | sleep 1 |
17 | 17 | ||
diff --git a/test/environment/rlimit.exp b/test/environment/rlimit.exp index 3bdbab4c2..acc87277b 100755 --- a/test/environment/rlimit.exp +++ b/test/environment/rlimit.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --rlimit-fsize=1024 --rlimit-nproc=1000 --rlimit-nofile=500 --rlimit-sigpending=200 --rlimit-as=1234567890\r" | 11 | send -- "firejail --rlimit-fsize=1024 --rlimit-nproc=1000 --rlimit-nofile=500 --rlimit-sigpending=200 --rlimit-as=1234567890\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
14 | "Child process initialized" | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
15 | } | 15 | } |
16 | sleep 1 | 16 | sleep 1 |
17 | 17 | ||
diff --git a/test/environment/shell-none.exp b/test/environment/shell-none.exp index 0af1bb88b..512e2efc2 100755 --- a/test/environment/shell-none.exp +++ b/test/environment/shell-none.exp | |||
@@ -24,7 +24,7 @@ after 100 | |||
24 | send -- "firejail --shell=none ls\r" | 24 | send -- "firejail --shell=none ls\r" |
25 | expect { | 25 | expect { |
26 | timeout {puts "TESTING ERROR 2\n";exit} | 26 | timeout {puts "TESTING ERROR 2\n";exit} |
27 | "Child process initialized" | 27 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
28 | } | 28 | } |
29 | expect { | 29 | expect { |
30 | timeout {puts "TESTING ERROR 3\n";exit} | 30 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -35,7 +35,7 @@ after 100 | |||
35 | send -- "firejail --profile=shell-none.profile ls\r" | 35 | send -- "firejail --profile=shell-none.profile ls\r" |
36 | expect { | 36 | expect { |
37 | timeout {puts "TESTING ERROR 4\n";exit} | 37 | timeout {puts "TESTING ERROR 4\n";exit} |
38 | "Child process initialized" | 38 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
39 | } | 39 | } |
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 5\n";exit} | 41 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/environment/sound.exp b/test/environment/sound.exp index 784cdfe1b..7ee1c74d7 100755 --- a/test/environment/sound.exp +++ b/test/environment/sound.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --nosound speaker-test\r" | 11 | send -- "firejail --nosound speaker-test\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 1\n";exit} | 13 | timeout {puts "TESTING ERROR 1\n";exit} |
14 | "Child process initialized" | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
15 | } | 15 | } |
16 | expect { | 16 | expect { |
17 | timeout {puts "TESTING ERROR 2\n";exit} | 17 | timeout {puts "TESTING ERROR 2\n";exit} |
@@ -22,7 +22,7 @@ sleep 2 | |||
22 | send -- "firejail --nosound aplay -l\r" | 22 | send -- "firejail --nosound aplay -l\r" |
23 | expect { | 23 | expect { |
24 | timeout {puts "TESTING ERROR 3\n";exit} | 24 | timeout {puts "TESTING ERROR 3\n";exit} |
25 | "Child process initialized" | 25 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
26 | } | 26 | } |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 4\n";exit} | 28 | timeout {puts "TESTING ERROR 4\n";exit} |
@@ -39,7 +39,7 @@ sleep 2 | |||
39 | send -- "firejail --profile=sound.profile speaker-test\r" | 39 | send -- "firejail --profile=sound.profile speaker-test\r" |
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 11\n";exit} | 41 | timeout {puts "TESTING ERROR 11\n";exit} |
42 | "Child process initialized" | 42 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
43 | } | 43 | } |
44 | expect { | 44 | expect { |
45 | timeout {puts "TESTING ERROR 12\n";exit} | 45 | timeout {puts "TESTING ERROR 12\n";exit} |
@@ -50,7 +50,7 @@ sleep 2 | |||
50 | send -- "firejail --profile=sound.profile aplay -l\r" | 50 | send -- "firejail --profile=sound.profile aplay -l\r" |
51 | expect { | 51 | expect { |
52 | timeout {puts "TESTING ERROR 13\n";exit} | 52 | timeout {puts "TESTING ERROR 13\n";exit} |
53 | "Child process initialized" | 53 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
54 | } | 54 | } |
55 | expect { | 55 | expect { |
56 | timeout {puts "TESTING ERROR 14\n";exit} | 56 | timeout {puts "TESTING ERROR 14\n";exit} |
@@ -67,7 +67,7 @@ sleep 2 | |||
67 | send -- "firejail aplay -l\r" | 67 | send -- "firejail aplay -l\r" |
68 | expect { | 68 | expect { |
69 | timeout {puts "TESTING ERROR 23\n";exit} | 69 | timeout {puts "TESTING ERROR 23\n";exit} |
70 | "Child process initialized" | 70 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
71 | } | 71 | } |
72 | expect { | 72 | expect { |
73 | timeout {puts "TESTING ERROR 24\n";exit} | 73 | timeout {puts "TESTING ERROR 24\n";exit} |
diff --git a/test/environment/timeout.exp b/test/environment/timeout.exp index 901bed2e8..b38881c81 100755 --- a/test/environment/timeout.exp +++ b/test/environment/timeout.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "time firejail --timeout=00:00:05\r" | 10 | send -- "time firejail --timeout=00:00:05\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/environment/umask.exp b/test/environment/umask.exp index d336ed2cd..46bd80a92 100755 --- a/test/environment/umask.exp +++ b/test/environment/umask.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --noprofile\r" | 10 | send -- "firejail --noprofile\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/environment/zsh.exp b/test/environment/zsh.exp index 13eee3433..9f871ea54 100755 --- a/test/environment/zsh.exp +++ b/test/environment/zsh.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --private --shell=/bin/zsh\r" | 11 | send -- "firejail --private --shell=/bin/zsh\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
14 | "Child process initialized" | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
15 | } | 15 | } |
16 | sleep 1 | 16 | sleep 1 |
17 | 17 | ||