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/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/root/join.exp')
-rwxr-xr-x | test/root/join.exp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/test/root/join.exp b/test/root/join.exp index 19b4c8f02..291ee9115 100755 --- a/test/root/join.exp +++ b/test/root/join.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --name=jointesting --cpu=0 --nice=2\r" | 11 | send -- "firejail --name=jointesting --cpu=0 --nice=2\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
14 | "Child process initialized" | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
15 | } | 15 | } |
16 | sleep 2 | 16 | sleep 2 |
17 | 17 | ||
@@ -21,14 +21,18 @@ expect { | |||
21 | timeout {puts "TESTING ERROR 1\n";exit} | 21 | timeout {puts "TESTING ERROR 1\n";exit} |
22 | "Switching to pid" | 22 | "Switching to pid" |
23 | } | 23 | } |
24 | expect { | ||
25 | timeout {puts "TESTING ERROR 2\n";exit} | ||
26 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" | ||
27 | } | ||
24 | sleep 1 | 28 | sleep 1 |
25 | send -- "ps aux\r" | 29 | send -- "ps aux\r" |
26 | expect { | 30 | expect { |
27 | timeout {puts "TESTING ERROR 2\n";exit} | 31 | timeout {puts "TESTING ERROR 3\n";exit} |
28 | "/bin/bash" | 32 | "/bin/bash" |
29 | } | 33 | } |
30 | expect { | 34 | expect { |
31 | timeout {puts "TESTING ERROR 3\n";exit} | 35 | timeout {puts "TESTING ERROR 4\n";exit} |
32 | "/bin/bash" | 36 | "/bin/bash" |
33 | } | 37 | } |
34 | 38 | ||
@@ -36,15 +40,15 @@ send -- "exit\r" | |||
36 | sleep 1 | 40 | sleep 1 |
37 | send -- "firejail --join-network=jointesting\r" | 41 | send -- "firejail --join-network=jointesting\r" |
38 | expect { | 42 | expect { |
39 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 5\n";exit} |
40 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
41 | } | 45 | } |
42 | send -- "exit\r" | 46 | send -- "exit\r" |
43 | sleep 1 | 47 | sleep 1 |
44 | send -- "firejail --join-filesystem=jointesting\r" | 48 | send -- "firejail --join-filesystem=jointesting\r" |
45 | expect { | 49 | expect { |
46 | timeout {puts "TESTING ERROR 5\n";exit} | 50 | timeout {puts "TESTING ERROR 6\n";exit} |
47 | "Child process initialized" | 51 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
48 | } | 52 | } |
49 | 53 | ||
50 | after 100 | 54 | after 100 |