From 7578e86ef8ddb78da44d426b94def77366627e0e Mon Sep 17 00:00:00 2001 From: smitsohu Date: Wed, 9 Feb 2022 18:04:36 +0100 Subject: 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. --- test/features/2.6.exp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/features/2.6.exp') 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] send -- "firejail --noprofile --net=eth0 --defaultgw=192.168.1.10 --protocol=unix,inet,netlink\r" expect { timeout {puts "TESTING ERROR 0\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 @@ -39,7 +39,7 @@ if { $overlay == "overlay" } { expect { timeout {puts "TESTING ERROR 2\n";exit} "overlay option is not available" {puts "grsecurity\n"; exit} - "Child process initialized" {puts "normal system\n"} + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} } sleep 1 @@ -60,7 +60,7 @@ if { $chroot == "chroot" } { send -- "firejail --noprofile --chroot=/tmp/chroot --net=eth0 --defaultgw=192.168.1.10 --protocol=unix,inet,netlink\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 1 -- cgit v1.2.3-54-g00ecf