diff options
author | 2022-02-09 18:04:36 +0100 | |
---|---|---|
committer | 2022-02-09 18:30:45 +0100 | |
commit | 7578e86ef8ddb78da44d426b94def77366627e0e (patch) | |
tree | e752d23f1b61a50fb7b7372d6799fe9ef4d111e4 /test/features/2.3.exp | |
parent | Merge pull request #4915 from kmk3/keepassx-restore-nou2f (diff) | |
download | firejail-7578e86ef8ddb78da44d426b94def77366627e0e.tar.gz firejail-7578e86ef8ddb78da44d426b94def77366627e0e.tar.zst firejail-7578e86ef8ddb78da44d426b94def77366627e0e.zip |
testing: fix expect matching of numbers
The sandbox timestamp should not be available for matching
when output is already expected from the next command
(this is only a problem if numeric output if expected from the
first command in the sandbox).
A possible alternative would be to flush the expect output buffer
with 'expect "*"' after the sandbox is up.
Diffstat (limited to 'test/features/2.3.exp')
-rwxr-xr-x | test/features/2.3.exp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/features/2.3.exp b/test/features/2.3.exp index dba3a47e1..5a188ccc3 100755 --- a/test/features/2.3.exp +++ b/test/features/2.3.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile --net=eth0 --dns=8.8.8.8 --dns=8.8.4.4\r" | 18 | send -- "firejail --noprofile --net=eth0 --dns=8.8.8.8 --dns=8.8.4.4\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -62,7 +62,7 @@ sleep 3 | |||
62 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --dns=8.8.8.8 --dns=8.8.4.4\r" | 62 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --dns=8.8.8.8 --dns=8.8.4.4\r" |
63 | expect { | 63 | expect { |
64 | timeout {puts "TESTING ERROR 0\n";exit} | 64 | timeout {puts "TESTING ERROR 0\n";exit} |
65 | "Child process initialized" | 65 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
66 | } | 66 | } |
67 | sleep 1 | 67 | sleep 1 |
68 | 68 | ||
@@ -111,7 +111,7 @@ if { $overlay == "overlay" } { | |||
111 | expect { | 111 | expect { |
112 | timeout {puts "TESTING ERROR 2\n";exit} | 112 | timeout {puts "TESTING ERROR 2\n";exit} |
113 | "overlay option is not available" {puts "grsecurity\n"; exit} | 113 | "overlay option is not available" {puts "grsecurity\n"; exit} |
114 | "Child process initialized" {puts "normal system\n"} | 114 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
115 | } | 115 | } |
116 | sleep 1 | 116 | sleep 1 |
117 | 117 | ||
@@ -155,7 +155,7 @@ if { $overlay == "overlay" } { | |||
155 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --overlay --dns=8.8.8.8 --dns=8.8.4.4\r" | 155 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --overlay --dns=8.8.8.8 --dns=8.8.4.4\r" |
156 | expect { | 156 | expect { |
157 | timeout {puts "TESTING ERROR 2\n";exit} | 157 | timeout {puts "TESTING ERROR 2\n";exit} |
158 | "Child process initialized" | 158 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
159 | } | 159 | } |
160 | sleep 1 | 160 | sleep 1 |
161 | 161 | ||
@@ -205,7 +205,7 @@ if { $chroot == "chroot" } { | |||
205 | send -- "firejail --noprofile --net=eth0 --chroot=/tmp/chroot --dns=8.8.8.8 --dns=8.8.4.4\r" | 205 | send -- "firejail --noprofile --net=eth0 --chroot=/tmp/chroot --dns=8.8.8.8 --dns=8.8.4.4\r" |
206 | expect { | 206 | expect { |
207 | timeout {puts "TESTING ERROR 4\n";exit} | 207 | timeout {puts "TESTING ERROR 4\n";exit} |
208 | "Child process initialized" | 208 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
209 | } | 209 | } |
210 | sleep 1 | 210 | sleep 1 |
211 | 211 | ||
@@ -249,7 +249,7 @@ if { $chroot == "chroot" } { | |||
249 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --chroot=/tmp/chroot --dns=8.8.8.8 --dns=8.8.4.4\r" | 249 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --chroot=/tmp/chroot --dns=8.8.8.8 --dns=8.8.4.4\r" |
250 | expect { | 250 | expect { |
251 | timeout {puts "TESTING ERROR 4\n";exit} | 251 | timeout {puts "TESTING ERROR 4\n";exit} |
252 | "Child process initialized" | 252 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
253 | } | 253 | } |
254 | sleep 1 | 254 | sleep 1 |
255 | 255 | ||