diff options
author | 2022-02-09 18:04:36 +0100 | |
---|---|---|
committer | 2022-02-09 18:30:45 +0100 | |
commit | 7578e86ef8ddb78da44d426b94def77366627e0e (patch) | |
tree | e752d23f1b61a50fb7b7372d6799fe9ef4d111e4 /test/features | |
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/features')
-rwxr-xr-x | test/features/1.1.exp | 6 | ||||
-rwxr-xr-x | test/features/1.10.exp | 6 | ||||
-rwxr-xr-x | test/features/1.2.exp | 6 | ||||
-rwxr-xr-x | test/features/1.4.exp | 6 | ||||
-rwxr-xr-x | test/features/1.5.exp | 6 | ||||
-rwxr-xr-x | test/features/1.6.exp | 6 | ||||
-rwxr-xr-x | test/features/1.7.exp | 6 | ||||
-rwxr-xr-x | test/features/1.8.exp | 6 | ||||
-rwxr-xr-x | test/features/2.1.exp | 6 | ||||
-rwxr-xr-x | test/features/2.2.exp | 6 | ||||
-rwxr-xr-x | test/features/2.3.exp | 12 | ||||
-rwxr-xr-x | test/features/2.4.exp | 12 | ||||
-rwxr-xr-x | test/features/2.5.exp | 6 | ||||
-rwxr-xr-x | test/features/2.6.exp | 6 | ||||
-rwxr-xr-x | test/features/3.1.exp | 6 | ||||
-rwxr-xr-x | test/features/3.10.exp | 6 | ||||
-rwxr-xr-x | test/features/3.11.exp | 6 | ||||
-rwxr-xr-x | test/features/3.2.exp | 6 | ||||
-rwxr-xr-x | test/features/3.3.exp | 6 | ||||
-rwxr-xr-x | test/features/3.4.exp | 6 | ||||
-rwxr-xr-x | test/features/3.5.exp | 6 | ||||
-rwxr-xr-x | test/features/3.6.exp | 6 | ||||
-rwxr-xr-x | test/features/3.7.exp | 6 | ||||
-rwxr-xr-x | test/features/3.8.exp | 6 | ||||
-rwxr-xr-x | test/features/3.9.exp | 6 |
25 files changed, 81 insertions, 81 deletions
diff --git a/test/features/1.1.exp b/test/features/1.1.exp index 1262ff403..916a610a6 100755 --- a/test/features/1.1.exp +++ b/test/features/1.1.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile\r" | 18 | send -- "firejail --noprofile\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -40,7 +40,7 @@ if { $overlay == "overlay" } { | |||
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 2\n";exit} | 41 | timeout {puts "TESTING ERROR 2\n";exit} |
42 | "overlay option is not available" {puts "grsecurity\n"; exit} | 42 | "overlay option is not available" {puts "grsecurity\n"; exit} |
43 | "Child process initialized" {puts "normal system\n"} | 43 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
44 | } | 44 | } |
45 | sleep 1 | 45 | sleep 1 |
46 | 46 | ||
@@ -61,7 +61,7 @@ if { $chroot == "chroot" } { | |||
61 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" | 61 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" |
62 | expect { | 62 | expect { |
63 | timeout {puts "TESTING ERROR 4\n";exit} | 63 | timeout {puts "TESTING ERROR 4\n";exit} |
64 | "Child process initialized" | 64 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
65 | } | 65 | } |
66 | sleep 1 | 66 | sleep 1 |
67 | 67 | ||
diff --git a/test/features/1.10.exp b/test/features/1.10.exp index 846532e71..53279f71e 100755 --- a/test/features/1.10.exp +++ b/test/features/1.10.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile\r" | 18 | send -- "firejail --noprofile\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -41,7 +41,7 @@ if { $overlay == "overlay" } { | |||
41 | expect { | 41 | expect { |
42 | timeout {puts "TESTING ERROR 2\n";exit} | 42 | timeout {puts "TESTING ERROR 2\n";exit} |
43 | "overlay option is not available" {puts "grsecurity\n"; exit} | 43 | "overlay option is not available" {puts "grsecurity\n"; exit} |
44 | "Child process initialized" {puts "normal system\n"} | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
45 | } | 45 | } |
46 | sleep 1 | 46 | sleep 1 |
47 | 47 | ||
@@ -63,7 +63,7 @@ if { $chroot == "chroot" } { | |||
63 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" | 63 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" |
64 | expect { | 64 | expect { |
65 | timeout {puts "TESTING ERROR 4\n";exit} | 65 | timeout {puts "TESTING ERROR 4\n";exit} |
66 | "Child process initialized" | 66 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
67 | } | 67 | } |
68 | sleep 1 | 68 | sleep 1 |
69 | 69 | ||
diff --git a/test/features/1.2.exp b/test/features/1.2.exp index 76b143a40..3043f0104 100755 --- a/test/features/1.2.exp +++ b/test/features/1.2.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile\r" | 18 | send -- "firejail --noprofile\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -64,7 +64,7 @@ if { $overlay == "overlay" } { | |||
64 | expect { | 64 | expect { |
65 | timeout {puts "TESTING ERROR 2\n";exit} | 65 | timeout {puts "TESTING ERROR 2\n";exit} |
66 | "overlay option is not available" {puts "grsecurity\n"; exit} | 66 | "overlay option is not available" {puts "grsecurity\n"; exit} |
67 | "Child process initialized" {puts "normal system\n"} | 67 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
68 | } | 68 | } |
69 | sleep 1 | 69 | sleep 1 |
70 | 70 | ||
@@ -105,7 +105,7 @@ if { $chroot == "chroot" } { | |||
105 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" | 105 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" |
106 | expect { | 106 | expect { |
107 | timeout {puts "TESTING ERROR 4\n";exit} | 107 | timeout {puts "TESTING ERROR 4\n";exit} |
108 | "Child process initialized" | 108 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
109 | } | 109 | } |
110 | sleep 1 | 110 | sleep 1 |
111 | 111 | ||
diff --git a/test/features/1.4.exp b/test/features/1.4.exp index 7b4839bd7..b7e8246a2 100755 --- a/test/features/1.4.exp +++ b/test/features/1.4.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile\r" | 18 | send -- "firejail --noprofile\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -53,7 +53,7 @@ if { $overlay == "overlay" } { | |||
53 | expect { | 53 | expect { |
54 | timeout {puts "TESTING ERROR 2\n";exit} | 54 | timeout {puts "TESTING ERROR 2\n";exit} |
55 | "overlay option is not available" {puts "grsecurity\n"; exit} | 55 | "overlay option is not available" {puts "grsecurity\n"; exit} |
56 | "Child process initialized" {puts "normal system\n"} | 56 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
57 | } | 57 | } |
58 | sleep 1 | 58 | sleep 1 |
59 | 59 | ||
@@ -86,7 +86,7 @@ if { $chroot == "chroot" } { | |||
86 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" | 86 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" |
87 | expect { | 87 | expect { |
88 | timeout {puts "TESTING ERROR 4\n";exit} | 88 | timeout {puts "TESTING ERROR 4\n";exit} |
89 | "Child process initialized" | 89 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
90 | } | 90 | } |
91 | sleep 1 | 91 | sleep 1 |
92 | 92 | ||
diff --git a/test/features/1.5.exp b/test/features/1.5.exp index a13a87893..cce8f490f 100755 --- a/test/features/1.5.exp +++ b/test/features/1.5.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile\r" | 18 | send -- "firejail --noprofile\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -40,7 +40,7 @@ if { $overlay == "overlay" } { | |||
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 2\n";exit} | 41 | timeout {puts "TESTING ERROR 2\n";exit} |
42 | "overlay option is not available" {puts "grsecurity\n"; exit} | 42 | "overlay option is not available" {puts "grsecurity\n"; exit} |
43 | "Child process initialized" {puts "normal system\n"} | 43 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
44 | } | 44 | } |
45 | sleep 1 | 45 | sleep 1 |
46 | 46 | ||
@@ -61,7 +61,7 @@ if { $chroot == "chroot" } { | |||
61 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" | 61 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" |
62 | expect { | 62 | expect { |
63 | timeout {puts "TESTING ERROR 4\n";exit} | 63 | timeout {puts "TESTING ERROR 4\n";exit} |
64 | "Child process initialized" | 64 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
65 | } | 65 | } |
66 | sleep 1 | 66 | sleep 1 |
67 | 67 | ||
diff --git a/test/features/1.6.exp b/test/features/1.6.exp index e53c6e2bf..81da44c64 100755 --- a/test/features/1.6.exp +++ b/test/features/1.6.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile\r" | 18 | send -- "firejail --noprofile\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -40,7 +40,7 @@ if { $overlay == "overlay" } { | |||
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 2\n";exit} | 41 | timeout {puts "TESTING ERROR 2\n";exit} |
42 | "overlay option is not available" {puts "grsecurity\n"; exit} | 42 | "overlay option is not available" {puts "grsecurity\n"; exit} |
43 | "Child process initialized" {puts "normal system\n"} | 43 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
44 | } | 44 | } |
45 | sleep 1 | 45 | sleep 1 |
46 | 46 | ||
@@ -61,7 +61,7 @@ if { $chroot == "chroot" } { | |||
61 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" | 61 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" |
62 | expect { | 62 | expect { |
63 | timeout {puts "TESTING ERROR 4\n";exit} | 63 | timeout {puts "TESTING ERROR 4\n";exit} |
64 | "Child process initialized" | 64 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
65 | } | 65 | } |
66 | sleep 1 | 66 | sleep 1 |
67 | 67 | ||
diff --git a/test/features/1.7.exp b/test/features/1.7.exp index f0987dcdc..a84b723de 100755 --- a/test/features/1.7.exp +++ b/test/features/1.7.exp | |||
@@ -20,7 +20,7 @@ sleep 1 | |||
20 | send -- "firejail --noprofile\r" | 20 | send -- "firejail --noprofile\r" |
21 | expect { | 21 | expect { |
22 | timeout {puts "TESTING ERROR 0\n";exit} | 22 | timeout {puts "TESTING ERROR 0\n";exit} |
23 | "Child process initialized" | 23 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
24 | } | 24 | } |
25 | sleep 1 | 25 | sleep 1 |
26 | 26 | ||
@@ -42,7 +42,7 @@ if { $overlay == "overlay" } { | |||
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 2\n";exit} | 43 | timeout {puts "TESTING ERROR 2\n";exit} |
44 | "overlay option is not available" {puts "grsecurity\n"; exit} | 44 | "overlay option is not available" {puts "grsecurity\n"; exit} |
45 | "Child process initialized" {puts "normal system\n"} | 45 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
46 | } | 46 | } |
47 | sleep 1 | 47 | sleep 1 |
48 | 48 | ||
@@ -63,7 +63,7 @@ if { $chroot == "chroot" } { | |||
63 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" | 63 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" |
64 | expect { | 64 | expect { |
65 | timeout {puts "TESTING ERROR 4\n";exit} | 65 | timeout {puts "TESTING ERROR 4\n";exit} |
66 | "Child process initialized" | 66 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
67 | } | 67 | } |
68 | sleep 1 | 68 | sleep 1 |
69 | 69 | ||
diff --git a/test/features/1.8.exp b/test/features/1.8.exp index 36c85e1cf..5f7b0cdbc 100755 --- a/test/features/1.8.exp +++ b/test/features/1.8.exp | |||
@@ -19,7 +19,7 @@ sleep 1 | |||
19 | send -- "firejail --noprofile\r" | 19 | send -- "firejail --noprofile\r" |
20 | expect { | 20 | expect { |
21 | timeout {puts "TESTING ERROR 0\n";exit} | 21 | timeout {puts "TESTING ERROR 0\n";exit} |
22 | "Child process initialized" | 22 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
23 | } | 23 | } |
24 | sleep 1 | 24 | sleep 1 |
25 | 25 | ||
@@ -71,7 +71,7 @@ if { $overlay == "overlay" } { | |||
71 | expect { | 71 | expect { |
72 | timeout {puts "TESTING ERROR 2\n";exit} | 72 | timeout {puts "TESTING ERROR 2\n";exit} |
73 | "overlay option is not available" {puts "grsecurity\n"; exit} | 73 | "overlay option is not available" {puts "grsecurity\n"; exit} |
74 | "Child process initialized" {puts "normal system\n"} | 74 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
75 | } | 75 | } |
76 | sleep 1 | 76 | sleep 1 |
77 | send -- "ls ~/.config/firejail\r" | 77 | send -- "ls ~/.config/firejail\r" |
@@ -122,7 +122,7 @@ if { $chroot == "chroot" } { | |||
122 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" | 122 | send -- "firejail --noprofile --chroot=/tmp/chroot\r" |
123 | expect { | 123 | expect { |
124 | timeout {puts "TESTING ERROR 4\n";exit} | 124 | timeout {puts "TESTING ERROR 4\n";exit} |
125 | "Child process initialized" | 125 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
126 | } | 126 | } |
127 | sleep 1 | 127 | sleep 1 |
128 | send -- "ls ~/.config/firejail\r" | 128 | send -- "ls ~/.config/firejail\r" |
diff --git a/test/features/2.1.exp b/test/features/2.1.exp index 586ab6490..b56cbc135 100755 --- a/test/features/2.1.exp +++ b/test/features/2.1.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile --hostname=bingo\r" | 18 | send -- "firejail --noprofile --hostname=bingo\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -56,7 +56,7 @@ if { $overlay == "overlay" } { | |||
56 | expect { | 56 | expect { |
57 | timeout {puts "TESTING ERROR 2\n";exit} | 57 | timeout {puts "TESTING ERROR 2\n";exit} |
58 | "overlay option is not available" {puts "grsecurity\n"; exit} | 58 | "overlay option is not available" {puts "grsecurity\n"; exit} |
59 | "Child process initialized" {puts "normal system\n"} | 59 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
60 | } | 60 | } |
61 | sleep 1 | 61 | sleep 1 |
62 | 62 | ||
@@ -93,7 +93,7 @@ if { $chroot == "chroot" } { | |||
93 | send -- "firejail --noprofile --hostname=bingo --chroot=/tmp/chroot\r" | 93 | send -- "firejail --noprofile --hostname=bingo --chroot=/tmp/chroot\r" |
94 | expect { | 94 | expect { |
95 | timeout {puts "TESTING ERROR 4\n";exit} | 95 | timeout {puts "TESTING ERROR 4\n";exit} |
96 | "Child process initialized" | 96 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
97 | } | 97 | } |
98 | sleep 1 | 98 | sleep 1 |
99 | 99 | ||
diff --git a/test/features/2.2.exp b/test/features/2.2.exp index 18828de12..378bd529a 100755 --- a/test/features/2.2.exp +++ b/test/features/2.2.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile --dns=4.2.2.1\r" | 18 | send -- "firejail --noprofile --dns=4.2.2.1\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -48,7 +48,7 @@ if { $overlay == "overlay" } { | |||
48 | expect { | 48 | expect { |
49 | timeout {puts "TESTING ERROR 2\n";exit} | 49 | timeout {puts "TESTING ERROR 2\n";exit} |
50 | "overlay option is not available" {puts "grsecurity\n"; exit} | 50 | "overlay option is not available" {puts "grsecurity\n"; exit} |
51 | "Child process initialized" {puts "normal system\n"} | 51 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
52 | } | 52 | } |
53 | sleep 1 | 53 | sleep 1 |
54 | 54 | ||
@@ -77,7 +77,7 @@ if { $chroot == "chroot" } { | |||
77 | send -- "firejail --noprofile --dns=4.2.2.1 --chroot=/tmp/chroot\r" | 77 | send -- "firejail --noprofile --dns=4.2.2.1 --chroot=/tmp/chroot\r" |
78 | expect { | 78 | expect { |
79 | timeout {puts "TESTING ERROR 4\n";exit} | 79 | timeout {puts "TESTING ERROR 4\n";exit} |
80 | "Child process initialized" | 80 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
81 | } | 81 | } |
82 | sleep 1 | 82 | sleep 1 |
83 | 83 | ||
diff --git a/test/features/2.3.exp b/test/features/2.3.exp index dba3a47e1..5a188ccc3 100755 --- a/test/features/2.3.exp +++ b/test/features/2.3.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile --net=eth0 --dns=8.8.8.8 --dns=8.8.4.4\r" | 18 | send -- "firejail --noprofile --net=eth0 --dns=8.8.8.8 --dns=8.8.4.4\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -62,7 +62,7 @@ sleep 3 | |||
62 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --dns=8.8.8.8 --dns=8.8.4.4\r" | 62 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --dns=8.8.8.8 --dns=8.8.4.4\r" |
63 | expect { | 63 | expect { |
64 | timeout {puts "TESTING ERROR 0\n";exit} | 64 | timeout {puts "TESTING ERROR 0\n";exit} |
65 | "Child process initialized" | 65 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
66 | } | 66 | } |
67 | sleep 1 | 67 | sleep 1 |
68 | 68 | ||
@@ -111,7 +111,7 @@ if { $overlay == "overlay" } { | |||
111 | expect { | 111 | expect { |
112 | timeout {puts "TESTING ERROR 2\n";exit} | 112 | timeout {puts "TESTING ERROR 2\n";exit} |
113 | "overlay option is not available" {puts "grsecurity\n"; exit} | 113 | "overlay option is not available" {puts "grsecurity\n"; exit} |
114 | "Child process initialized" {puts "normal system\n"} | 114 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
115 | } | 115 | } |
116 | sleep 1 | 116 | sleep 1 |
117 | 117 | ||
@@ -155,7 +155,7 @@ if { $overlay == "overlay" } { | |||
155 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --overlay --dns=8.8.8.8 --dns=8.8.4.4\r" | 155 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --overlay --dns=8.8.8.8 --dns=8.8.4.4\r" |
156 | expect { | 156 | expect { |
157 | timeout {puts "TESTING ERROR 2\n";exit} | 157 | timeout {puts "TESTING ERROR 2\n";exit} |
158 | "Child process initialized" | 158 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
159 | } | 159 | } |
160 | sleep 1 | 160 | sleep 1 |
161 | 161 | ||
@@ -205,7 +205,7 @@ if { $chroot == "chroot" } { | |||
205 | send -- "firejail --noprofile --net=eth0 --chroot=/tmp/chroot --dns=8.8.8.8 --dns=8.8.4.4\r" | 205 | send -- "firejail --noprofile --net=eth0 --chroot=/tmp/chroot --dns=8.8.8.8 --dns=8.8.4.4\r" |
206 | expect { | 206 | expect { |
207 | timeout {puts "TESTING ERROR 4\n";exit} | 207 | timeout {puts "TESTING ERROR 4\n";exit} |
208 | "Child process initialized" | 208 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
209 | } | 209 | } |
210 | sleep 1 | 210 | sleep 1 |
211 | 211 | ||
@@ -249,7 +249,7 @@ if { $chroot == "chroot" } { | |||
249 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --chroot=/tmp/chroot --dns=8.8.8.8 --dns=8.8.4.4\r" | 249 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --chroot=/tmp/chroot --dns=8.8.8.8 --dns=8.8.4.4\r" |
250 | expect { | 250 | expect { |
251 | timeout {puts "TESTING ERROR 4\n";exit} | 251 | timeout {puts "TESTING ERROR 4\n";exit} |
252 | "Child process initialized" | 252 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
253 | } | 253 | } |
254 | sleep 1 | 254 | sleep 1 |
255 | 255 | ||
diff --git a/test/features/2.4.exp b/test/features/2.4.exp index e2f080617..15159c9b7 100755 --- a/test/features/2.4.exp +++ b/test/features/2.4.exp | |||
@@ -19,7 +19,7 @@ set chroot [lindex $argv 1] | |||
19 | send -- "firejail --noprofile --net=br0\r" | 19 | send -- "firejail --noprofile --net=br0\r" |
20 | expect { | 20 | expect { |
21 | timeout {puts "TESTING ERROR 0\n";exit} | 21 | timeout {puts "TESTING ERROR 0\n";exit} |
22 | "Child process initialized" | 22 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
23 | } | 23 | } |
24 | sleep 1 | 24 | sleep 1 |
25 | 25 | ||
@@ -56,7 +56,7 @@ sleep 1 | |||
56 | send -- "firejail --noprofile --net=br0 --ip=10.10.20.4\r" | 56 | send -- "firejail --noprofile --net=br0 --ip=10.10.20.4\r" |
57 | expect { | 57 | expect { |
58 | timeout {puts "TESTING ERROR 0\n";exit} | 58 | timeout {puts "TESTING ERROR 0\n";exit} |
59 | "Child process initialized" | 59 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
60 | } | 60 | } |
61 | sleep 1 | 61 | sleep 1 |
62 | 62 | ||
@@ -99,7 +99,7 @@ if { $overlay == "overlay" } { | |||
99 | expect { | 99 | expect { |
100 | timeout {puts "TESTING ERROR 2\n";exit} | 100 | timeout {puts "TESTING ERROR 2\n";exit} |
101 | "overlay option is not available" {puts "grsecurity\n"; exit} | 101 | "overlay option is not available" {puts "grsecurity\n"; exit} |
102 | "Child process initialized" {puts "normal system\n"} | 102 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
103 | } | 103 | } |
104 | sleep 1 | 104 | sleep 1 |
105 | 105 | ||
@@ -136,7 +136,7 @@ if { $overlay == "overlay" } { | |||
136 | send -- "firejail --noprofile --net=br0 --ip=10.10.20.4 --overlay\r" | 136 | send -- "firejail --noprofile --net=br0 --ip=10.10.20.4 --overlay\r" |
137 | expect { | 137 | expect { |
138 | timeout {puts "TESTING ERROR 2\n";exit} | 138 | timeout {puts "TESTING ERROR 2\n";exit} |
139 | "Child process initialized" | 139 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
140 | } | 140 | } |
141 | sleep 1 | 141 | sleep 1 |
142 | 142 | ||
@@ -179,7 +179,7 @@ if { $chroot == "chroot" } { | |||
179 | send -- "firejail --noprofile --net=br0 --chroot=/tmp/chroot\r" | 179 | send -- "firejail --noprofile --net=br0 --chroot=/tmp/chroot\r" |
180 | expect { | 180 | expect { |
181 | timeout {puts "TESTING ERROR 4\n";exit} | 181 | timeout {puts "TESTING ERROR 4\n";exit} |
182 | "Child process initialized" | 182 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
183 | } | 183 | } |
184 | sleep 1 | 184 | sleep 1 |
185 | 185 | ||
@@ -208,7 +208,7 @@ if { $chroot == "chroot" } { | |||
208 | send -- "firejail --noprofile --net=br0 --ip=10.10.20.4 --chroot=/tmp/chroot\r" | 208 | send -- "firejail --noprofile --net=br0 --ip=10.10.20.4 --chroot=/tmp/chroot\r" |
209 | expect { | 209 | expect { |
210 | timeout {puts "TESTING ERROR 4\n";exit} | 210 | timeout {puts "TESTING ERROR 4\n";exit} |
211 | "Child process initialized" | 211 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
212 | } | 212 | } |
213 | sleep 1 | 213 | sleep 1 |
214 | 214 | ||
diff --git a/test/features/2.5.exp b/test/features/2.5.exp index ed8a01b36..2995d34f7 100755 --- a/test/features/2.5.exp +++ b/test/features/2.5.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile --interface=eth0.5\r" | 18 | send -- "firejail --noprofile --interface=eth0.5\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -51,7 +51,7 @@ if { $overlay == "overlay" } { | |||
51 | expect { | 51 | expect { |
52 | timeout {puts "TESTING ERROR 2\n";exit} | 52 | timeout {puts "TESTING ERROR 2\n";exit} |
53 | "overlay option is not available" {puts "grsecurity\n"; exit} | 53 | "overlay option is not available" {puts "grsecurity\n"; exit} |
54 | "Child process initialized" {puts "normal system\n"} | 54 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
55 | } | 55 | } |
56 | sleep 1 | 56 | sleep 1 |
57 | 57 | ||
@@ -84,7 +84,7 @@ if { $chroot == "chroot" } { | |||
84 | send -- "firejail --noprofile --chroot=/tmp/chroot --interface=eth0.7\r" | 84 | send -- "firejail --noprofile --chroot=/tmp/chroot --interface=eth0.7\r" |
85 | expect { | 85 | expect { |
86 | timeout {puts "TESTING ERROR 4\n";exit} | 86 | timeout {puts "TESTING ERROR 4\n";exit} |
87 | "Child process initialized" | 87 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
88 | } | 88 | } |
89 | sleep 1 | 89 | sleep 1 |
90 | 90 | ||
diff --git a/test/features/2.6.exp b/test/features/2.6.exp index 081bdeb94..e8cd780ee 100755 --- a/test/features/2.6.exp +++ b/test/features/2.6.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile --net=eth0 --defaultgw=192.168.1.10 --protocol=unix,inet,netlink\r" | 18 | send -- "firejail --noprofile --net=eth0 --defaultgw=192.168.1.10 --protocol=unix,inet,netlink\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -39,7 +39,7 @@ if { $overlay == "overlay" } { | |||
39 | expect { | 39 | expect { |
40 | timeout {puts "TESTING ERROR 2\n";exit} | 40 | timeout {puts "TESTING ERROR 2\n";exit} |
41 | "overlay option is not available" {puts "grsecurity\n"; exit} | 41 | "overlay option is not available" {puts "grsecurity\n"; exit} |
42 | "Child process initialized" {puts "normal system\n"} | 42 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
43 | } | 43 | } |
44 | sleep 1 | 44 | sleep 1 |
45 | 45 | ||
@@ -60,7 +60,7 @@ if { $chroot == "chroot" } { | |||
60 | send -- "firejail --noprofile --chroot=/tmp/chroot --net=eth0 --defaultgw=192.168.1.10 --protocol=unix,inet,netlink\r" | 60 | send -- "firejail --noprofile --chroot=/tmp/chroot --net=eth0 --defaultgw=192.168.1.10 --protocol=unix,inet,netlink\r" |
61 | expect { | 61 | expect { |
62 | timeout {puts "TESTING ERROR 4\n";exit} | 62 | timeout {puts "TESTING ERROR 4\n";exit} |
63 | "Child process initialized" | 63 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
64 | } | 64 | } |
65 | sleep 1 | 65 | sleep 1 |
66 | 66 | ||
diff --git a/test/features/3.1.exp b/test/features/3.1.exp index dcf51fc9c..95d1d609b 100755 --- a/test/features/3.1.exp +++ b/test/features/3.1.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile --private\r" | 18 | send -- "firejail --noprofile --private\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -70,7 +70,7 @@ if { $overlay == "overlay" } { | |||
70 | expect { | 70 | expect { |
71 | timeout {puts "TESTING ERROR 2\n";exit} | 71 | timeout {puts "TESTING ERROR 2\n";exit} |
72 | "overlay option is not available" {puts "grsecurity\n"; exit} | 72 | "overlay option is not available" {puts "grsecurity\n"; exit} |
73 | "Child process initialized" {puts "normal system\n"} | 73 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
74 | } | 74 | } |
75 | sleep 1 | 75 | sleep 1 |
76 | 76 | ||
@@ -120,7 +120,7 @@ if { $chroot == "chroot" } { | |||
120 | send -- "firejail --noprofile --chroot=/tmp/chroot --private\r" | 120 | send -- "firejail --noprofile --chroot=/tmp/chroot --private\r" |
121 | expect { | 121 | expect { |
122 | timeout {puts "TESTING ERROR 4\n";exit} | 122 | timeout {puts "TESTING ERROR 4\n";exit} |
123 | "Child process initialized" | 123 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
124 | } | 124 | } |
125 | sleep 1 | 125 | sleep 1 |
126 | 126 | ||
diff --git a/test/features/3.10.exp b/test/features/3.10.exp index e6dbbf93b..5d4414f40 100755 --- a/test/features/3.10.exp +++ b/test/features/3.10.exp | |||
@@ -22,7 +22,7 @@ sleep 1 | |||
22 | send -- "firejail --noprofile --whitelist=/tmp/test1dir\r" | 22 | send -- "firejail --noprofile --whitelist=/tmp/test1dir\r" |
23 | expect { | 23 | expect { |
24 | timeout {puts "TESTING ERROR 0\n";exit} | 24 | timeout {puts "TESTING ERROR 0\n";exit} |
25 | "Child process initialized" | 25 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
26 | } | 26 | } |
27 | sleep 1 | 27 | sleep 1 |
28 | 28 | ||
@@ -78,7 +78,7 @@ if { $overlay == "overlay" } { | |||
78 | expect { | 78 | expect { |
79 | timeout {puts "TESTING ERROR 2\n";exit} | 79 | timeout {puts "TESTING ERROR 2\n";exit} |
80 | "overlay option is not available" {puts "grsecurity\n"; exit} | 80 | "overlay option is not available" {puts "grsecurity\n"; exit} |
81 | "Child process initialized" {puts "normal system\n"} | 81 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
82 | } | 82 | } |
83 | sleep 1 | 83 | sleep 1 |
84 | 84 | ||
@@ -136,7 +136,7 @@ if { $chroot == "chroot" } { | |||
136 | send -- "firejail --noprofile --chroot=/tmp/chroot --whitelist=/tmp/test1dir\r" | 136 | send -- "firejail --noprofile --chroot=/tmp/chroot --whitelist=/tmp/test1dir\r" |
137 | expect { | 137 | expect { |
138 | timeout {puts "TESTING ERROR 4\n";exit} | 138 | timeout {puts "TESTING ERROR 4\n";exit} |
139 | "Child process initialized" | 139 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
140 | } | 140 | } |
141 | sleep 1 | 141 | sleep 1 |
142 | 142 | ||
diff --git a/test/features/3.11.exp b/test/features/3.11.exp index bf528ef25..8287f9dbf 100755 --- a/test/features/3.11.exp +++ b/test/features/3.11.exp | |||
@@ -21,7 +21,7 @@ sleep 1 | |||
21 | send -- "firejail --profile=3.11.profile\r" | 21 | send -- "firejail --profile=3.11.profile\r" |
22 | expect { | 22 | expect { |
23 | timeout {puts "TESTING ERROR 0\n";exit} | 23 | timeout {puts "TESTING ERROR 0\n";exit} |
24 | "Child process initialized" | 24 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
25 | } | 25 | } |
26 | sleep 1 | 26 | sleep 1 |
27 | 27 | ||
@@ -73,7 +73,7 @@ if { $overlay == "overlay" } { | |||
73 | expect { | 73 | expect { |
74 | timeout {puts "TESTING ERROR 10\n";exit} | 74 | timeout {puts "TESTING ERROR 10\n";exit} |
75 | "overlay option is not available" {puts "grsecurity\n"; exit} | 75 | "overlay option is not available" {puts "grsecurity\n"; exit} |
76 | "Child process initialized" {puts "normal system\n"} | 76 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
77 | } | 77 | } |
78 | sleep 1 | 78 | sleep 1 |
79 | 79 | ||
@@ -127,7 +127,7 @@ if { $chroot == "chroot" } { | |||
127 | send -- "firejail --profile=3.11.profile\r" | 127 | send -- "firejail --profile=3.11.profile\r" |
128 | expect { | 128 | expect { |
129 | timeout {puts "TESTING ERROR 20\n";exit} | 129 | timeout {puts "TESTING ERROR 20\n";exit} |
130 | "Child process initialized" | 130 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
131 | } | 131 | } |
132 | sleep 1 | 132 | sleep 1 |
133 | 133 | ||
diff --git a/test/features/3.2.exp b/test/features/3.2.exp index b4a0b04fe..9af0513ea 100755 --- a/test/features/3.2.exp +++ b/test/features/3.2.exp | |||
@@ -20,7 +20,7 @@ sleep 1 | |||
20 | send -- "firejail --noprofile --read-only=/home/netblue/.config\r" | 20 | send -- "firejail --noprofile --read-only=/home/netblue/.config\r" |
21 | expect { | 21 | expect { |
22 | timeout {puts "TESTING ERROR 0\n";exit} | 22 | timeout {puts "TESTING ERROR 0\n";exit} |
23 | "Child process initialized" | 23 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
24 | } | 24 | } |
25 | sleep 1 | 25 | sleep 1 |
26 | 26 | ||
@@ -41,7 +41,7 @@ if { $overlay == "overlay" } { | |||
41 | expect { | 41 | expect { |
42 | timeout {puts "TESTING ERROR 2\n";exit} | 42 | timeout {puts "TESTING ERROR 2\n";exit} |
43 | "overlay option is not available" {puts "grsecurity\n"; exit} | 43 | "overlay option is not available" {puts "grsecurity\n"; exit} |
44 | "Child process initialized" {puts "normal system\n"} | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
45 | } | 45 | } |
46 | sleep 1 | 46 | sleep 1 |
47 | 47 | ||
@@ -64,7 +64,7 @@ if { $chroot == "chroot" } { | |||
64 | send -- "firejail --noprofile --chroot=/tmp/chroot --read-only=/home/netblue/.config\r" | 64 | send -- "firejail --noprofile --chroot=/tmp/chroot --read-only=/home/netblue/.config\r" |
65 | expect { | 65 | expect { |
66 | timeout {puts "TESTING ERROR 4\n";exit} | 66 | timeout {puts "TESTING ERROR 4\n";exit} |
67 | "Child process initialized" | 67 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
68 | } | 68 | } |
69 | sleep 1 | 69 | sleep 1 |
70 | 70 | ||
diff --git a/test/features/3.3.exp b/test/features/3.3.exp index fc1a982ec..71b6f70db 100755 --- a/test/features/3.3.exp +++ b/test/features/3.3.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile --blacklist=/home/netblue/.config\r" | 18 | send -- "firejail --noprofile --blacklist=/home/netblue/.config\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -40,7 +40,7 @@ if { $overlay == "overlay" } { | |||
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 2\n";exit} | 41 | timeout {puts "TESTING ERROR 2\n";exit} |
42 | "overlay option is not available" {puts "grsecurity\n"; exit} | 42 | "overlay option is not available" {puts "grsecurity\n"; exit} |
43 | "Child process initialized" {puts "normal system\n"} | 43 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
44 | } | 44 | } |
45 | sleep 1 | 45 | sleep 1 |
46 | 46 | ||
@@ -61,7 +61,7 @@ if { $chroot == "chroot" } { | |||
61 | send -- "firejail --noprofile --chroot=/tmp/chroot --blacklist=/home/netblue/.config\r" | 61 | send -- "firejail --noprofile --chroot=/tmp/chroot --blacklist=/home/netblue/.config\r" |
62 | expect { | 62 | expect { |
63 | timeout {puts "TESTING ERROR 4\n";exit} | 63 | timeout {puts "TESTING ERROR 4\n";exit} |
64 | "Child process initialized" | 64 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
65 | } | 65 | } |
66 | sleep 1 | 66 | sleep 1 |
67 | 67 | ||
diff --git a/test/features/3.4.exp b/test/features/3.4.exp index 0e1a7df5f..d3f894da2 100755 --- a/test/features/3.4.exp +++ b/test/features/3.4.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile --whitelist=/home/netblue/.config\r" | 18 | send -- "firejail --noprofile --whitelist=/home/netblue/.config\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -83,7 +83,7 @@ if { $overlay == "overlay" } { | |||
83 | expect { | 83 | expect { |
84 | timeout {puts "TESTING ERROR 2\n";exit} | 84 | timeout {puts "TESTING ERROR 2\n";exit} |
85 | "overlay option is not available" {puts "grsecurity\n"; exit} | 85 | "overlay option is not available" {puts "grsecurity\n"; exit} |
86 | "Child process initialized" {puts "normal system\n"} | 86 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
87 | } | 87 | } |
88 | sleep 1 | 88 | sleep 1 |
89 | 89 | ||
@@ -147,7 +147,7 @@ if { $chroot == "chroot" } { | |||
147 | send -- "firejail --noprofile --chroot=/tmp/chroot --whitelist=/home/netblue/.config\r" | 147 | send -- "firejail --noprofile --chroot=/tmp/chroot --whitelist=/home/netblue/.config\r" |
148 | expect { | 148 | expect { |
149 | timeout {puts "TESTING ERROR 4\n";exit} | 149 | timeout {puts "TESTING ERROR 4\n";exit} |
150 | "Child process initialized" | 150 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
151 | } | 151 | } |
152 | sleep 1 | 152 | sleep 1 |
153 | 153 | ||
diff --git a/test/features/3.5.exp b/test/features/3.5.exp index a595df398..c19680d41 100755 --- a/test/features/3.5.exp +++ b/test/features/3.5.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile --private-dev\r" | 18 | send -- "firejail --noprofile --private-dev\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -41,7 +41,7 @@ if { $overlay == "overlay" } { | |||
41 | expect { | 41 | expect { |
42 | timeout {puts "TESTING ERROR 2\n";exit} | 42 | timeout {puts "TESTING ERROR 2\n";exit} |
43 | "overlay option is not available" {puts "grsecurity\n"; exit} | 43 | "overlay option is not available" {puts "grsecurity\n"; exit} |
44 | "Child process initialized" {puts "normal system\n"} | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
45 | } | 45 | } |
46 | sleep 1 | 46 | sleep 1 |
47 | 47 | ||
@@ -64,7 +64,7 @@ if { $chroot == "chroot" } { | |||
64 | send -- "firejail --noprofile --chroot=/tmp/chroot --private-dev\r" | 64 | send -- "firejail --noprofile --chroot=/tmp/chroot --private-dev\r" |
65 | expect { | 65 | expect { |
66 | timeout {puts "TESTING ERROR 4\n";exit} | 66 | timeout {puts "TESTING ERROR 4\n";exit} |
67 | "Child process initialized" | 67 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
68 | } | 68 | } |
69 | sleep 1 | 69 | sleep 1 |
70 | 70 | ||
diff --git a/test/features/3.6.exp b/test/features/3.6.exp index 439b40411..31978e764 100755 --- a/test/features/3.6.exp +++ b/test/features/3.6.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile --private-etc=group,hostname,hosts,nsswitch.conf,passwd,resolv.conf,skel\r" | 18 | send -- "firejail --noprofile --private-etc=group,hostname,hosts,nsswitch.conf,passwd,resolv.conf,skel\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -40,7 +40,7 @@ if { $overlay == "overlay" } { | |||
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 2\n";exit} | 41 | timeout {puts "TESTING ERROR 2\n";exit} |
42 | "overlay option is not available" {puts "grsecurity\n"; exit} | 42 | "overlay option is not available" {puts "grsecurity\n"; exit} |
43 | "Child process initialized" {puts "normal system\n"} | 43 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
44 | } | 44 | } |
45 | sleep 1 | 45 | sleep 1 |
46 | 46 | ||
@@ -68,7 +68,7 @@ if { $chroot == "chroot" } { | |||
68 | expect { | 68 | expect { |
69 | timeout {puts "TESTING ERROR 5\n";exit} | 69 | timeout {puts "TESTING ERROR 5\n";exit} |
70 | "chroot option is not available" {puts "grsecurity\n"; exit} | 70 | "chroot option is not available" {puts "grsecurity\n"; exit} |
71 | "Child process initialized" | 71 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
72 | } | 72 | } |
73 | sleep 1 | 73 | sleep 1 |
74 | 74 | ||
diff --git a/test/features/3.7.exp b/test/features/3.7.exp index b966f34e5..4a0cb0d79 100755 --- a/test/features/3.7.exp +++ b/test/features/3.7.exp | |||
@@ -22,7 +22,7 @@ sleep 1 | |||
22 | send -- "firejail --noprofile --private-tmp\r" | 22 | send -- "firejail --noprofile --private-tmp\r" |
23 | expect { | 23 | expect { |
24 | timeout {puts "TESTING ERROR 0\n";exit} | 24 | timeout {puts "TESTING ERROR 0\n";exit} |
25 | "Child process initialized" | 25 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
26 | } | 26 | } |
27 | sleep 1 | 27 | sleep 1 |
28 | 28 | ||
@@ -49,7 +49,7 @@ if { $overlay == "overlay" } { | |||
49 | expect { | 49 | expect { |
50 | timeout {puts "TESTING ERROR 2\n";exit} | 50 | timeout {puts "TESTING ERROR 2\n";exit} |
51 | "overlay option is not available" {puts "grsecurity\n"; exit} | 51 | "overlay option is not available" {puts "grsecurity\n"; exit} |
52 | "Child process initialized" {puts "normal system\n"} | 52 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
53 | } | 53 | } |
54 | sleep 1 | 54 | sleep 1 |
55 | 55 | ||
@@ -76,7 +76,7 @@ if { $chroot == "chroot" } { | |||
76 | send -- "firejail --noprofile --chroot=/tmp/chroot --private-tmp\r" | 76 | send -- "firejail --noprofile --chroot=/tmp/chroot --private-tmp\r" |
77 | expect { | 77 | expect { |
78 | timeout {puts "TESTING ERROR 4\n";exit} | 78 | timeout {puts "TESTING ERROR 4\n";exit} |
79 | "Child process initialized" | 79 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
80 | } | 80 | } |
81 | sleep 1 | 81 | sleep 1 |
82 | 82 | ||
diff --git a/test/features/3.8.exp b/test/features/3.8.exp index 0fa74813c..0a53599a9 100755 --- a/test/features/3.8.exp +++ b/test/features/3.8.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile --private-bin=bash,cat,cp,ls,wc\r" | 18 | send -- "firejail --noprofile --private-bin=bash,cat,cp,ls,wc\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -41,7 +41,7 @@ if { $overlay == "overlay" } { | |||
41 | expect { | 41 | expect { |
42 | timeout {puts "TESTING ERROR 2\n";exit} | 42 | timeout {puts "TESTING ERROR 2\n";exit} |
43 | "overlay option is not available" {puts "grsecurity\n"; exit} | 43 | "overlay option is not available" {puts "grsecurity\n"; exit} |
44 | "Child process initialized" {puts "normal system\n"} | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
45 | } | 45 | } |
46 | sleep 1 | 46 | sleep 1 |
47 | 47 | ||
@@ -68,7 +68,7 @@ if { $chroot == "chroot" } { | |||
68 | } | 68 | } |
69 | expect { | 69 | expect { |
70 | timeout {puts "TESTING ERROR 5\n";exit} | 70 | timeout {puts "TESTING ERROR 5\n";exit} |
71 | "Child process initialized" | 71 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
72 | } | 72 | } |
73 | sleep 1 | 73 | sleep 1 |
74 | 74 | ||
diff --git a/test/features/3.9.exp b/test/features/3.9.exp index 47db477ca..7d843e7cc 100755 --- a/test/features/3.9.exp +++ b/test/features/3.9.exp | |||
@@ -18,7 +18,7 @@ set chroot [lindex $argv 1] | |||
18 | send -- "firejail --noprofile --whitelist=/dev/tty --whitelist=/dev/null\r" | 18 | send -- "firejail --noprofile --whitelist=/dev/tty --whitelist=/dev/null\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0\n";exit} | 20 | timeout {puts "TESTING ERROR 0\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
@@ -42,7 +42,7 @@ if { $overlay == "overlay" } { | |||
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 2\n";exit} | 43 | timeout {puts "TESTING ERROR 2\n";exit} |
44 | "overlay option is not available" {puts "grsecurity\n"; exit} | 44 | "overlay option is not available" {puts "grsecurity\n"; exit} |
45 | "Child process initialized" {puts "normal system\n"} | 45 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "normal system\n"} |
46 | } | 46 | } |
47 | sleep 1 | 47 | sleep 1 |
48 | 48 | ||
@@ -65,7 +65,7 @@ if { $chroot == "chroot" } { | |||
65 | send -- "firejail --noprofile --chroot=/tmp/chroot --whitelist=/dev/tty --whitelist=/dev/null\r" | 65 | send -- "firejail --noprofile --chroot=/tmp/chroot --whitelist=/dev/tty --whitelist=/dev/null\r" |
66 | expect { | 66 | expect { |
67 | timeout {puts "TESTING ERROR 4\n";exit} | 67 | timeout {puts "TESTING ERROR 4\n";exit} |
68 | "Child process initialized" | 68 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
69 | } | 69 | } |
70 | sleep 1 | 70 | sleep 1 |
71 | 71 | ||