diff options
author | 2022-02-09 18:04:36 +0100 | |
---|---|---|
committer | 2022-02-09 18:30:45 +0100 | |
commit | 7578e86ef8ddb78da44d426b94def77366627e0e (patch) | |
tree | e752d23f1b61a50fb7b7372d6799fe9ef4d111e4 /test/stress | |
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/stress')
-rwxr-xr-x | test/stress/blacklist.exp | 4 | ||||
-rwxr-xr-x | test/stress/env.exp | 2 | ||||
-rwxr-xr-x | test/stress/net_macvlan.exp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/stress/blacklist.exp b/test/stress/blacklist.exp index 255719426..7d32ad114 100755 --- a/test/stress/blacklist.exp +++ b/test/stress/blacklist.exp | |||
@@ -14,7 +14,7 @@ set i 1 | |||
14 | send -- "firejail --profile=blacklist.profile\r" | 14 | send -- "firejail --profile=blacklist.profile\r" |
15 | expect { | 15 | expect { |
16 | timeout {puts "TESTING ERROR 1\n";exit} | 16 | timeout {puts "TESTING ERROR 1\n";exit} |
17 | "Child process initialized" | 17 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
18 | } | 18 | } |
19 | 19 | ||
20 | while { $i <= $MAXi } { | 20 | while { $i <= $MAXi } { |
@@ -36,7 +36,7 @@ set i 1 | |||
36 | send -- "firejail --profile=noblacklist.profile\r" | 36 | send -- "firejail --profile=noblacklist.profile\r" |
37 | expect { | 37 | expect { |
38 | timeout {puts "TESTING ERROR 1\n";exit} | 38 | timeout {puts "TESTING ERROR 1\n";exit} |
39 | "Child process initialized" | 39 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
40 | } | 40 | } |
41 | 41 | ||
42 | while { $i <= $MAXi } { | 42 | while { $i <= $MAXi } { |
diff --git a/test/stress/env.exp b/test/stress/env.exp index 931eef569..5411819ec 100755 --- a/test/stress/env.exp +++ b/test/stress/env.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --profile=env.profile\r" | 11 | send -- "firejail --profile=env.profile\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 1\n";exit} | 13 | timeout {puts "TESTING ERROR 1\n";exit} |
14 | "Child process initialized" | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
15 | } | 15 | } |
16 | 16 | ||
17 | send -- "env | grep FJSTRESS77\r" | 17 | send -- "env | grep FJSTRESS77\r" |
diff --git a/test/stress/net_macvlan.exp b/test/stress/net_macvlan.exp index 05c2c1589..f17067cbb 100755 --- a/test/stress/net_macvlan.exp +++ b/test/stress/net_macvlan.exp | |||
@@ -15,7 +15,7 @@ while { $i <= $MAXi } { | |||
15 | send -- "firejail --net=eth0 --ip=192.168.1.$i\r" | 15 | send -- "firejail --net=eth0 --ip=192.168.1.$i\r" |
16 | expect { | 16 | expect { |
17 | timeout {puts "TESTING ERROR 0\n";exit} | 17 | timeout {puts "TESTING ERROR 0\n";exit} |
18 | "Child process initialized" | 18 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
19 | } | 19 | } |
20 | incr i | 20 | incr i |
21 | after 100 | 21 | after 100 |
@@ -30,7 +30,7 @@ while { $i <= $MAXi } { | |||
30 | send -- "firejail --net=eth0 --iprange=192.168.1.201,192.168.1.220\r" | 30 | send -- "firejail --net=eth0 --iprange=192.168.1.201,192.168.1.220\r" |
31 | expect { | 31 | expect { |
32 | timeout {puts "TESTING ERROR 2\n";exit} | 32 | timeout {puts "TESTING ERROR 2\n";exit} |
33 | "Child process initialized" | 33 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
34 | } | 34 | } |
35 | puts "************ $i ******************\n" | 35 | puts "************ $i ******************\n" |
36 | incr i | 36 | incr i |