diff options
author | 2022-02-09 18:04:36 +0100 | |
---|---|---|
committer | 2022-02-09 18:30:45 +0100 | |
commit | 7578e86ef8ddb78da44d426b94def77366627e0e (patch) | |
tree | e752d23f1b61a50fb7b7372d6799fe9ef4d111e4 /test/filters/caps-join.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/filters/caps-join.exp')
-rwxr-xr-x | test/filters/caps-join.exp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/filters/caps-join.exp b/test/filters/caps-join.exp index e9b5f59d0..921d6b695 100755 --- a/test/filters/caps-join.exp +++ b/test/filters/caps-join.exp | |||
@@ -20,7 +20,7 @@ set spawn_id $id1 | |||
20 | send -- "firejail --name=jointesting\r" | 20 | send -- "firejail --name=jointesting\r" |
21 | expect { | 21 | expect { |
22 | timeout {puts "TESTING ERROR 0\n";exit} | 22 | timeout {puts "TESTING ERROR 0\n";exit} |
23 | "Child process initialized" | 23 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
24 | } | 24 | } |
25 | sleep 1 | 25 | sleep 1 |
26 | 26 | ||
@@ -44,7 +44,7 @@ set spawn_id $id1 | |||
44 | send -- "firejail --name=jointesting --noprofile\r" | 44 | send -- "firejail --name=jointesting --noprofile\r" |
45 | expect { | 45 | expect { |
46 | timeout {puts "TESTING ERROR 10\n";exit} | 46 | timeout {puts "TESTING ERROR 10\n";exit} |
47 | "Child process initialized" | 47 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
48 | } | 48 | } |
49 | sleep 1 | 49 | sleep 1 |
50 | 50 | ||
@@ -76,7 +76,7 @@ set spawn_id $id1 | |||
76 | send -- "firejail --name=jointesting --noprofile --caps.keep=chown,fowner\r" | 76 | send -- "firejail --name=jointesting --noprofile --caps.keep=chown,fowner\r" |
77 | expect { | 77 | expect { |
78 | timeout {puts "TESTING ERROR20\n";exit} | 78 | timeout {puts "TESTING ERROR20\n";exit} |
79 | "Child process initialized" | 79 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
80 | } | 80 | } |
81 | sleep 1 | 81 | sleep 1 |
82 | 82 | ||