diff options
author | 2022-02-09 18:04:36 +0100 | |
---|---|---|
committer | 2022-02-09 18:30:45 +0100 | |
commit | 7578e86ef8ddb78da44d426b94def77366627e0e (patch) | |
tree | e752d23f1b61a50fb7b7372d6799fe9ef4d111e4 /test/fs/whitelist.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/fs/whitelist.exp')
-rwxr-xr-x | test/fs/whitelist.exp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/fs/whitelist.exp b/test/fs/whitelist.exp index 2a970ca37..8e98b9dfa 100755 --- a/test/fs/whitelist.exp +++ b/test/fs/whitelist.exp | |||
@@ -36,7 +36,7 @@ after 200 | |||
36 | send -- "firejail --whitelist=~/fjtest-file --whitelist=~/fjtest-dir --debug\r" | 36 | send -- "firejail --whitelist=~/fjtest-file --whitelist=~/fjtest-dir --debug\r" |
37 | expect { | 37 | expect { |
38 | timeout {puts "TESTING ERROR 0\n";exit} | 38 | timeout {puts "TESTING ERROR 0\n";exit} |
39 | "Child process initialized" | 39 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
40 | } | 40 | } |
41 | sleep 1 | 41 | sleep 1 |
42 | 42 | ||
@@ -73,7 +73,7 @@ sleep 1 | |||
73 | send -- "firejail --whitelist=~/fjtest-dir/fjtest-dir/fjtest-file\r" | 73 | send -- "firejail --whitelist=~/fjtest-dir/fjtest-dir/fjtest-file\r" |
74 | expect { | 74 | expect { |
75 | timeout {puts "TESTING ERROR 10\n";exit} | 75 | timeout {puts "TESTING ERROR 10\n";exit} |
76 | "Child process initialized" | 76 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
77 | } | 77 | } |
78 | sleep 1 | 78 | sleep 1 |
79 | 79 | ||
@@ -98,7 +98,7 @@ sleep 1 | |||
98 | send -- "firejail --whitelist=~/fjtest-file-lnk --whitelist=~/fjtest-dir-lnk\r" | 98 | send -- "firejail --whitelist=~/fjtest-file-lnk --whitelist=~/fjtest-dir-lnk\r" |
99 | expect { | 99 | expect { |
100 | timeout {puts "TESTING ERROR 20\n";exit} | 100 | timeout {puts "TESTING ERROR 20\n";exit} |
101 | "Child process initialized" | 101 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
102 | } | 102 | } |
103 | sleep 1 | 103 | sleep 1 |
104 | 104 | ||