diff options
author | 2022-02-09 18:04:36 +0100 | |
---|---|---|
committer | 2022-02-09 18:30:45 +0100 | |
commit | 7578e86ef8ddb78da44d426b94def77366627e0e (patch) | |
tree | e752d23f1b61a50fb7b7372d6799fe9ef4d111e4 /test/utils/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/utils/join.exp')
-rwxr-xr-x | test/utils/join.exp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/test/utils/join.exp b/test/utils/join.exp index 9d3dccd92..82decce51 100755 --- a/test/utils/join.exp +++ b/test/utils/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 | ||
@@ -26,17 +26,21 @@ after 100 | |||
26 | 26 | ||
27 | send -- "firejail --join=jointesting\r" | 27 | send -- "firejail --join=jointesting\r" |
28 | expect { | 28 | expect { |
29 | timeout {puts "TESTING ERROR 1\n";exit} | 29 | timeout {puts "TESTING ERROR 2\n";exit} |
30 | "Switching to pid" | 30 | "Switching to pid" |
31 | } | 31 | } |
32 | expect { | ||
33 | timeout {puts "TESTING ERROR 3\n";exit} | ||
34 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" | ||
35 | } | ||
32 | sleep 1 | 36 | sleep 1 |
33 | send -- "ps aux\r" | 37 | send -- "ps aux\r" |
34 | expect { | 38 | expect { |
35 | timeout {puts "TESTING ERROR 2\n";exit} | 39 | timeout {puts "TESTING ERROR 4\n";exit} |
36 | "/bin/bash" | 40 | "/bin/bash" |
37 | } | 41 | } |
38 | expect { | 42 | expect { |
39 | timeout {puts "TESTING ERROR 3\n";exit} | 43 | timeout {puts "TESTING ERROR 5\n";exit} |
40 | "/bin/bash" | 44 | "/bin/bash" |
41 | } | 45 | } |
42 | 46 | ||
@@ -44,13 +48,13 @@ send -- "exit\r" | |||
44 | sleep 1 | 48 | sleep 1 |
45 | send -- "firejail --join-network=jointesting\r" | 49 | send -- "firejail --join-network=jointesting\r" |
46 | expect { | 50 | expect { |
47 | timeout {puts "TESTING ERROR 4\n";exit} | 51 | timeout {puts "TESTING ERROR 6\n";exit} |
48 | "is only available to root user" | 52 | "is only available to root user" |
49 | } | 53 | } |
50 | after 100 | 54 | after 100 |
51 | send -- "firejail --join-filesystem=jointesting\r" | 55 | send -- "firejail --join-filesystem=jointesting\r" |
52 | expect { | 56 | expect { |
53 | timeout {puts "TESTING ERROR 5\n";exit} | 57 | timeout {puts "TESTING ERROR 7\n";exit} |
54 | "is only available to root user" | 58 | "is only available to root user" |
55 | } | 59 | } |
56 | 60 | ||