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/1.8.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/1.8.exp')
-rwxr-xr-x | test/features/1.8.exp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/features/1.8.exp b/test/features/1.8.exp index 36c85e1cf..5f7b0cdbc 100755 --- a/test/features/1.8.exp +++ b/test/features/1.8.exp | |||
@@ -19,7 +19,7 @@ sleep 1 | |||
19 | send -- "firejail --noprofile\r" | 19 | send -- "firejail --noprofile\r" |
20 | expect { | 20 | expect { |
21 | timeout {puts "TESTING ERROR 0\n";exit} | 21 | timeout {puts "TESTING ERROR 0\n";exit} |
22 | "Child process initialized" | 22 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
23 | } | 23 | } |
24 | sleep 1 | 24 | sleep 1 |
25 | 25 | ||
@@ -71,7 +71,7 @@ if { $overlay == "overlay" } { | |||
71 | expect { | 71 | expect { |
72 | timeout {puts "TESTING ERROR 2\n";exit} | 72 | timeout {puts "TESTING ERROR 2\n";exit} |
73 | "overlay option is not available" {puts "grsecurity\n"; exit} | 73 | "overlay option is not available" {puts "grsecurity\n"; exit} |
74 | "Child process initialized" {puts "normal system\n"} | 74 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
75 | } | 75 | } |
76 | sleep 1 | 76 | sleep 1 |
77 | send -- "ls ~/.config/firejail\r" | 77 | send -- "ls ~/.config/firejail\r" |
@@ -122,7 +122,7 @@ if { $chroot == "chroot" } { | |||
122 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" | 122 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" |
123 | expect { | 123 | expect { |
124 | timeout {puts "TESTING ERROR 4\n";exit} | 124 | timeout {puts "TESTING ERROR 4\n";exit} |
125 | "Child process initialized" | 125 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
126 | } | 126 | } |
127 | sleep 1 | 127 | sleep 1 |
128 | send -- "ls ~/.config/firejail\r" | 128 | send -- "ls ~/.config/firejail\r" |