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/3.10.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/3.10.exp')
-rwxr-xr-x | test/features/3.10.exp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/features/3.10.exp b/test/features/3.10.exp index e6dbbf93b..5d4414f40 100755 --- a/test/features/3.10.exp +++ b/test/features/3.10.exp | |||
@@ -22,7 +22,7 @@ sleep 1 | |||
22 | send -- "firejail --noprofile --whitelist=/tmp/test1dir\r" | 22 | send -- "firejail --noprofile --whitelist=/tmp/test1dir\r" |
23 | expect { | 23 | expect { |
24 | timeout {puts "TESTING ERROR 0\n";exit} | 24 | timeout {puts "TESTING ERROR 0\n";exit} |
25 | "Child process initialized" | 25 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
26 | } | 26 | } |
27 | sleep 1 | 27 | sleep 1 |
28 | 28 | ||
@@ -78,7 +78,7 @@ if { $overlay == "overlay" } { | |||
78 | expect { | 78 | expect { |
79 | timeout {puts "TESTING ERROR 2\n";exit} | 79 | timeout {puts "TESTING ERROR 2\n";exit} |
80 | "overlay option is not available" {puts "grsecurity\n"; exit} | 80 | "overlay option is not available" {puts "grsecurity\n"; exit} |
81 | "Child process initialized" {puts "normal system\n"} | 81 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
82 | } | 82 | } |
83 | sleep 1 | 83 | sleep 1 |
84 | 84 | ||
@@ -136,7 +136,7 @@ if { $chroot == "chroot" } { | |||
136 | send -- "firejail --noprofile --chroot=/tmp/chroot --whitelist=/tmp/test1dir\r" | 136 | send -- "firejail --noprofile --chroot=/tmp/chroot --whitelist=/tmp/test1dir\r" |
137 | expect { | 137 | expect { |
138 | timeout {puts "TESTING ERROR 4\n";exit} | 138 | timeout {puts "TESTING ERROR 4\n";exit} |
139 | "Child process initialized" | 139 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
140 | } | 140 | } |
141 | sleep 1 | 141 | sleep 1 |
142 | 142 | ||