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/environment/keep-fd.exp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/environment/keep-fd.exp') 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 send -- "firejail --noprofile\r" expect { timeout {puts "TESTING ERROR 2\n";exit} - "Child process initialized" + -re {Child process initialized in [0-9]+.[0-9]+ ms} } after 100 @@ -83,7 +83,7 @@ after 500 send -- "firejail --noprofile --keep-fd=\$READ_FD\r" expect { timeout {puts "TESTING ERROR 6\n";exit} - "Child process initialized" + -re {Child process initialized in [0-9]+.[0-9]+ ms} } after 100 @@ -119,7 +119,7 @@ after 500 send -- "firejail --noprofile --keep-fd=\$WRITE_FD\r" expect { timeout {puts "TESTING ERROR 10\n";exit} - "Child process initialized" + -re {Child process initialized in [0-9]+.[0-9]+ ms} } after 100 @@ -155,7 +155,7 @@ after 500 send -- "firejail --noprofile --keep-fd=\$READ_FD,\$WRITE_FD\r" expect { timeout {puts "TESTING ERROR 14\n";exit} - "Child process initialized" + -re {Child process initialized in [0-9]+.[0-9]+ ms} } after 100 @@ -191,7 +191,7 @@ after 500 send -- "firejail --noprofile --keep-fd=all\r" expect { timeout {puts "TESTING ERROR 18\n";exit} - "Child process initialized" + -re {Child process initialized in [0-9]+.[0-9]+ ms} } after 100 -- cgit v1.2.3-54-g00ecf