aboutsummaryrefslogtreecommitdiffstats
path: root/test/features/2.6.exp
diff options
context:
space:
mode:
authorLibravatar smitsohu <smitsohu@gmail.com>2022-02-09 18:04:36 +0100
committerLibravatar smitsohu <smitsohu@gmail.com>2022-02-09 18:30:45 +0100
commit7578e86ef8ddb78da44d426b94def77366627e0e (patch)
treee752d23f1b61a50fb7b7372d6799fe9ef4d111e4 /test/features/2.6.exp
parentMerge pull request #4915 from kmk3/keepassx-restore-nou2f (diff)
downloadfirejail-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.6.exp')
-rwxr-xr-xtest/features/2.6.exp6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/features/2.6.exp b/test/features/2.6.exp
index 081bdeb94..e8cd780ee 100755
--- a/test/features/2.6.exp
+++ b/test/features/2.6.exp
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1]
18send -- "firejail --noprofile --net=eth0 --defaultgw=192.168.1.10 --protocol=unix,inet,netlink\r" 18send -- "firejail --noprofile --net=eth0 --defaultgw=192.168.1.10 --protocol=unix,inet,netlink\r"
19expect { 19expect {
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}
23sleep 1 23sleep 1
24 24
@@ -39,7 +39,7 @@ if { $overlay == "overlay" } {
39 expect { 39 expect {
40 timeout {puts "TESTING ERROR 2\n";exit} 40 timeout {puts "TESTING ERROR 2\n";exit}
41 "overlay option is not available" {puts "grsecurity\n"; exit} 41 "overlay option is not available" {puts "grsecurity\n"; exit}
42 "Child process initialized" {puts "normal system\n"} 42 -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"}
43 } 43 }
44 sleep 1 44 sleep 1
45 45
@@ -60,7 +60,7 @@ if { $chroot == "chroot" } {
60 send -- "firejail --noprofile --chroot=/tmp/chroot --net=eth0 --defaultgw=192.168.1.10 --protocol=unix,inet,netlink\r" 60 send -- "firejail --noprofile --chroot=/tmp/chroot --net=eth0 --defaultgw=192.168.1.10 --protocol=unix,inet,netlink\r"
61 expect { 61 expect {
62 timeout {puts "TESTING ERROR 4\n";exit} 62 timeout {puts "TESTING ERROR 4\n";exit}
63 "Child process initialized" 63 -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
64 } 64 }
65 sleep 1 65 sleep 1
66 66