diff options
author | 2022-02-09 18:04:36 +0100 | |
---|---|---|
committer | 2022-02-09 18:30:45 +0100 | |
commit | 7578e86ef8ddb78da44d426b94def77366627e0e (patch) | |
tree | e752d23f1b61a50fb7b7372d6799fe9ef4d111e4 /test/overlay | |
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/overlay')
-rwxr-xr-x | test/overlay/firefox-x11-xorg.exp | 2 | ||||
-rwxr-xr-x | test/overlay/firefox-x11.exp | 2 | ||||
-rwxr-xr-x | test/overlay/firefox.exp | 4 | ||||
-rwxr-xr-x | test/overlay/fs-named.exp | 4 | ||||
-rwxr-xr-x | test/overlay/fs-tmpfs.exp | 2 | ||||
-rwxr-xr-x | test/overlay/fs.exp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/test/overlay/firefox-x11-xorg.exp b/test/overlay/firefox-x11-xorg.exp index da8948b86..691e58437 100755 --- a/test/overlay/firefox-x11-xorg.exp +++ b/test/overlay/firefox-x11-xorg.exp | |||
@@ -36,7 +36,7 @@ expect { | |||
36 | send -- "firejail --overlay --name=blablabla\r" | 36 | send -- "firejail --overlay --name=blablabla\r" |
37 | expect { | 37 | expect { |
38 | timeout {puts "TESTING ERROR 4\n";exit} | 38 | timeout {puts "TESTING ERROR 4\n";exit} |
39 | "Child process initialized" | 39 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
40 | } | 40 | } |
41 | sleep 2 | 41 | sleep 2 |
42 | 42 | ||
diff --git a/test/overlay/firefox-x11.exp b/test/overlay/firefox-x11.exp index 652385cda..96c6796bb 100755 --- a/test/overlay/firefox-x11.exp +++ b/test/overlay/firefox-x11.exp | |||
@@ -36,7 +36,7 @@ expect { | |||
36 | send -- "firejail --name=blablabla --overlay\r" | 36 | send -- "firejail --name=blablabla --overlay\r" |
37 | expect { | 37 | expect { |
38 | timeout {puts "TESTING ERROR 4\n";exit} | 38 | timeout {puts "TESTING ERROR 4\n";exit} |
39 | "Child process initialized" | 39 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
40 | } | 40 | } |
41 | sleep 2 | 41 | sleep 2 |
42 | 42 | ||
diff --git a/test/overlay/firefox.exp b/test/overlay/firefox.exp index d77d85498..eb7276f99 100755 --- a/test/overlay/firefox.exp +++ b/test/overlay/firefox.exp | |||
@@ -14,7 +14,7 @@ expect { | |||
14 | } | 14 | } |
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 | sleep 10 | 19 | sleep 10 |
20 | 20 | ||
@@ -47,7 +47,7 @@ expect { | |||
47 | send -- "firejail --name=blablabla --overlay\r" | 47 | send -- "firejail --name=blablabla --overlay\r" |
48 | expect { | 48 | expect { |
49 | timeout {puts "TESTING ERROR 4\n";exit} | 49 | timeout {puts "TESTING ERROR 4\n";exit} |
50 | "Child process initialized" | 50 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
51 | } | 51 | } |
52 | sleep 2 | 52 | sleep 2 |
53 | 53 | ||
diff --git a/test/overlay/fs-named.exp b/test/overlay/fs-named.exp index d2bfd43a3..25762337b 100755 --- a/test/overlay/fs-named.exp +++ b/test/overlay/fs-named.exp | |||
@@ -12,7 +12,7 @@ expect { | |||
12 | timeout {puts "TESTING ERROR 2\n";exit} | 12 | timeout {puts "TESTING ERROR 2\n";exit} |
13 | "not available for kernels older than 3.18" {puts "\nTESTING: overlayfs not available\n"; exit} | 13 | "not available for kernels older than 3.18" {puts "\nTESTING: overlayfs not available\n"; exit} |
14 | "Error: --overlay option is not available on Grsecurity systems" {puts "\nTESTING: overlayfs not available\n"; exit} | 14 | "Error: --overlay option is not available on Grsecurity systems" {puts "\nTESTING: overlayfs not available\n"; exit} |
15 | "Child process initialized" {puts "found\n"} | 15 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "found\n"} |
16 | } | 16 | } |
17 | sleep 1 | 17 | sleep 1 |
18 | send -- "stty -echo\r" | 18 | send -- "stty -echo\r" |
@@ -52,7 +52,7 @@ expect { | |||
52 | timeout {puts "TESTING ERROR 2\n";exit} | 52 | timeout {puts "TESTING ERROR 2\n";exit} |
53 | "not available for kernels older than 3.18" {puts "\nTESTING: overlayfs not available\n"; exit} | 53 | "not available for kernels older than 3.18" {puts "\nTESTING: overlayfs not available\n"; exit} |
54 | "Error: --overlay option is not available on Grsecurity systems" {puts "\nTESTING: overlayfs not available\n"; exit} | 54 | "Error: --overlay option is not available on Grsecurity systems" {puts "\nTESTING: overlayfs not available\n"; exit} |
55 | "Child process initialized" {puts "found\n"} | 55 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "found\n"} |
56 | } | 56 | } |
57 | sleep 1 | 57 | sleep 1 |
58 | 58 | ||
diff --git a/test/overlay/fs-tmpfs.exp b/test/overlay/fs-tmpfs.exp index c3794ffed..442a0fffa 100755 --- a/test/overlay/fs-tmpfs.exp +++ b/test/overlay/fs-tmpfs.exp | |||
@@ -21,7 +21,7 @@ expect { | |||
21 | timeout {puts "TESTING ERROR 1\n";exit} | 21 | timeout {puts "TESTING ERROR 1\n";exit} |
22 | "not available for kernels older than 3.18" {puts "\nTESTING: overlayfs not available\n"; exit} | 22 | "not available for kernels older than 3.18" {puts "\nTESTING: overlayfs not available\n"; exit} |
23 | "Error: --overlay option is not available on Grsecurity systems" {puts "\nTESTING: overlayfs not available\n"; exit} | 23 | "Error: --overlay option is not available on Grsecurity systems" {puts "\nTESTING: overlayfs not available\n"; exit} |
24 | "Child process initialized" {puts "found\n"} | 24 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "found\n"} |
25 | } | 25 | } |
26 | sleep 1 | 26 | sleep 1 |
27 | send -- "stty -echo\r" | 27 | send -- "stty -echo\r" |
diff --git a/test/overlay/fs.exp b/test/overlay/fs.exp index 85d8c50b1..21de942ec 100755 --- a/test/overlay/fs.exp +++ b/test/overlay/fs.exp | |||
@@ -12,7 +12,7 @@ expect { | |||
12 | timeout {puts "TESTING ERROR 2\n";exit} | 12 | timeout {puts "TESTING ERROR 2\n";exit} |
13 | "not available for kernels older than 3.18" {puts "\nTESTING: overlayfs not available\n"; exit} | 13 | "not available for kernels older than 3.18" {puts "\nTESTING: overlayfs not available\n"; exit} |
14 | "Error: --overlay option is not available on Grsecurity systems" {puts "\nTESTING: overlayfs not available\n"; exit} | 14 | "Error: --overlay option is not available on Grsecurity systems" {puts "\nTESTING: overlayfs not available\n"; exit} |
15 | "Child process initialized" {puts "found\n"} | 15 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "found\n"} |
16 | } | 16 | } |
17 | sleep 1 | 17 | sleep 1 |
18 | 18 | ||