diff options
author | 2022-02-09 18:04:36 +0100 | |
---|---|---|
committer | 2022-02-09 18:30:45 +0100 | |
commit | 7578e86ef8ddb78da44d426b94def77366627e0e (patch) | |
tree | e752d23f1b61a50fb7b7372d6799fe9ef4d111e4 /test/root/private.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/root/private.exp')
-rwxr-xr-x | test/root/private.exp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/root/private.exp b/test/root/private.exp index edc2520a2..70d0218fa 100755 --- a/test/root/private.exp +++ b/test/root/private.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --private\r" | 10 | send -- "firejail --private\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
@@ -42,7 +42,7 @@ after 100 | |||
42 | send -- "firejail --private-opt=firejail-test-file,firejail-test-dir --debug\r" | 42 | send -- "firejail --private-opt=firejail-test-file,firejail-test-dir --debug\r" |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 3\n";exit} | 44 | timeout {puts "TESTING ERROR 3\n";exit} |
45 | "Child process initialized" | 45 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
46 | } | 46 | } |
47 | sleep 1 | 47 | sleep 1 |
48 | 48 | ||
@@ -57,7 +57,7 @@ sleep 1 | |||
57 | send -- "firejail --whitelist=/opt/firejail-test-file --whitelist=/opt/firejail-test-dir --debug\r" | 57 | send -- "firejail --whitelist=/opt/firejail-test-file --whitelist=/opt/firejail-test-dir --debug\r" |
58 | expect { | 58 | expect { |
59 | timeout {puts "TESTING ERROR 3.1\n";exit} | 59 | timeout {puts "TESTING ERROR 3.1\n";exit} |
60 | "Child process initialized" | 60 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
61 | } | 61 | } |
62 | sleep 1 | 62 | sleep 1 |
63 | 63 | ||
@@ -80,7 +80,7 @@ after 100 | |||
80 | send -- "firejail --private-srv=firejail-test-file,firejail-test-dir --debug\r" | 80 | send -- "firejail --private-srv=firejail-test-file,firejail-test-dir --debug\r" |
81 | expect { | 81 | expect { |
82 | timeout {puts "TESTING ERROR 5\n";exit} | 82 | timeout {puts "TESTING ERROR 5\n";exit} |
83 | "Child process initialized" | 83 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
84 | } | 84 | } |
85 | sleep 1 | 85 | sleep 1 |
86 | 86 | ||
@@ -95,7 +95,7 @@ sleep 1 | |||
95 | send -- "firejail --whitelist=/srv/firejail-test-file --whitelist=/srv/firejail-test-dir --debug\r" | 95 | send -- "firejail --whitelist=/srv/firejail-test-file --whitelist=/srv/firejail-test-dir --debug\r" |
96 | expect { | 96 | expect { |
97 | timeout {puts "TESTING ERROR 5.1\n";exit} | 97 | timeout {puts "TESTING ERROR 5.1\n";exit} |
98 | "Child process initialized" | 98 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
99 | } | 99 | } |
100 | sleep 1 | 100 | sleep 1 |
101 | 101 | ||