aboutsummaryrefslogtreecommitdiffstats
path: root/test/features/3.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/3.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/3.6.exp')
-rwxr-xr-xtest/features/3.6.exp6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/features/3.6.exp b/test/features/3.6.exp
index 439b40411..31978e764 100755
--- a/test/features/3.6.exp
+++ b/test/features/3.6.exp
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1]
18send -- "firejail --noprofile --private-etc=group,hostname,hosts,nsswitch.conf,passwd,resolv.conf,skel\r" 18send -- "firejail --noprofile --private-etc=group,hostname,hosts,nsswitch.conf,passwd,resolv.conf,skel\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
@@ -40,7 +40,7 @@ if { $overlay == "overlay" } {
40 expect { 40 expect {
41 timeout {puts "TESTING ERROR 2\n";exit} 41 timeout {puts "TESTING ERROR 2\n";exit}
42 "overlay option is not available" {puts "grsecurity\n"; exit} 42 "overlay option is not available" {puts "grsecurity\n"; exit}
43 "Child process initialized" {puts "normal system\n"} 43 -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"}
44 } 44 }
45 sleep 1 45 sleep 1
46 46
@@ -68,7 +68,7 @@ if { $chroot == "chroot" } {
68 expect { 68 expect {
69 timeout {puts "TESTING ERROR 5\n";exit} 69 timeout {puts "TESTING ERROR 5\n";exit}
70 "chroot option is not available" {puts "grsecurity\n"; exit} 70 "chroot option is not available" {puts "grsecurity\n"; exit}
71 "Child process initialized" 71 -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
72 } 72 }
73 sleep 1 73 sleep 1
74 74