diff options
Diffstat (limited to 'test')
244 files changed, 559 insertions, 523 deletions
diff --git a/test/appimage/appimage-args.exp b/test/appimage/appimage-args.exp index a65197a52..e1fb8567a 100755 --- a/test/appimage/appimage-args.exp +++ b/test/appimage/appimage-args.exp | |||
@@ -23,7 +23,7 @@ expect { | |||
23 | } | 23 | } |
24 | expect { | 24 | expect { |
25 | timeout {puts "TESTING ERROR 4\n";exit} | 25 | timeout {puts "TESTING ERROR 4\n";exit} |
26 | "Child process initialized" | 26 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
27 | } | 27 | } |
28 | sleep 2 | 28 | sleep 2 |
29 | 29 | ||
@@ -51,7 +51,7 @@ expect { | |||
51 | send -- "firejail --name=blablabla\r" | 51 | send -- "firejail --name=blablabla\r" |
52 | expect { | 52 | expect { |
53 | timeout {puts "TESTING ERROR 7\n";exit} | 53 | timeout {puts "TESTING ERROR 7\n";exit} |
54 | "Child process initialized" | 54 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
55 | } | 55 | } |
56 | sleep 2 | 56 | sleep 2 |
57 | 57 | ||
diff --git a/test/appimage/appimage-trace.exp b/test/appimage/appimage-trace.exp index dfd2aaf9b..d1530349e 100755 --- a/test/appimage/appimage-trace.exp +++ b/test/appimage/appimage-trace.exp | |||
@@ -11,7 +11,7 @@ set appimage_id $spawn_id | |||
11 | send -- "firejail --trace --timeout=00:00:05 --appimage Leafpad-0.8.17-x86_64.AppImage\r" | 11 | send -- "firejail --trace --timeout=00:00:05 --appimage Leafpad-0.8.17-x86_64.AppImage\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 | expect { | 16 | expect { |
17 | timeout {puts "TESTING ERROR 2\n";exit} | 17 | timeout {puts "TESTING ERROR 2\n";exit} |
@@ -38,7 +38,7 @@ sleep 1 | |||
38 | send -- "firejail --trace --timeout=00:00:05 --appimage Leafpad-0.8.18.1.glibc2.4-x86_64.AppImage\r" | 38 | send -- "firejail --trace --timeout=00:00:05 --appimage Leafpad-0.8.18.1.glibc2.4-x86_64.AppImage\r" |
39 | expect { | 39 | expect { |
40 | timeout {puts "TESTING ERROR 11\n";exit} | 40 | timeout {puts "TESTING ERROR 11\n";exit} |
41 | "Child process initialized" | 41 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
42 | } | 42 | } |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 12\n";exit} | 44 | timeout {puts "TESTING ERROR 12\n";exit} |
diff --git a/test/appimage/appimage-v1.exp b/test/appimage/appimage-v1.exp index 0fc4ad0f0..2fcccfd5b 100755 --- a/test/appimage/appimage-v1.exp +++ b/test/appimage/appimage-v1.exp | |||
@@ -11,7 +11,7 @@ set appimage_id $spawn_id | |||
11 | send -- "firejail --name=appimage-test --debug --appimage Leafpad-0.8.17-x86_64.AppImage\r" | 11 | send -- "firejail --name=appimage-test --debug --appimage Leafpad-0.8.17-x86_64.AppImage\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 | sleep 2 | 16 | sleep 2 |
17 | 17 | ||
@@ -39,7 +39,7 @@ expect { | |||
39 | send -- "firejail --name=blablabla\r" | 39 | send -- "firejail --name=blablabla\r" |
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 4\n";exit} | 41 | timeout {puts "TESTING ERROR 4\n";exit} |
42 | "Child process initialized" | 42 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
43 | } | 43 | } |
44 | sleep 2 | 44 | sleep 2 |
45 | 45 | ||
diff --git a/test/appimage/appimage-v2.exp b/test/appimage/appimage-v2.exp index 8f61de6e9..d289165d9 100755 --- a/test/appimage/appimage-v2.exp +++ b/test/appimage/appimage-v2.exp | |||
@@ -11,7 +11,7 @@ set appimage_id $spawn_id | |||
11 | send -- "firejail --name=appimage-test --appimage Leafpad-0.8.18.1.glibc2.4-x86_64.AppImage\r" | 11 | send -- "firejail --name=appimage-test --appimage Leafpad-0.8.18.1.glibc2.4-x86_64.AppImage\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 | sleep 2 | 16 | sleep 2 |
17 | 17 | ||
@@ -39,7 +39,7 @@ expect { | |||
39 | send -- "firejail --name=blablabla\r" | 39 | send -- "firejail --name=blablabla\r" |
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 4\n";exit} | 41 | timeout {puts "TESTING ERROR 4\n";exit} |
42 | "Child process initialized" | 42 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
43 | } | 43 | } |
44 | sleep 2 | 44 | sleep 2 |
45 | 45 | ||
diff --git a/test/apps-x11-xorg/firefox.exp b/test/apps-x11-xorg/firefox.exp index 23c5d4675..4a85b593b 100755 --- a/test/apps-x11-xorg/firefox.exp +++ b/test/apps-x11-xorg/firefox.exp | |||
@@ -36,7 +36,7 @@ expect { | |||
36 | send -- "firejail --name=blablabla\r" | 36 | send -- "firejail --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/apps-x11-xorg/thunderbird.exp b/test/apps-x11-xorg/thunderbird.exp index ede339cbe..a06303fc5 100755 --- a/test/apps-x11-xorg/thunderbird.exp +++ b/test/apps-x11-xorg/thunderbird.exp | |||
@@ -33,7 +33,7 @@ expect { | |||
33 | send -- "firejail --name=blablabla\r" | 33 | send -- "firejail --name=blablabla\r" |
34 | expect { | 34 | expect { |
35 | timeout {puts "TESTING ERROR 4\n";exit} | 35 | timeout {puts "TESTING ERROR 4\n";exit} |
36 | "Child process initialized" | 36 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
37 | } | 37 | } |
38 | sleep 2 | 38 | sleep 2 |
39 | 39 | ||
diff --git a/test/apps-x11-xorg/transmission-gtk.exp b/test/apps-x11-xorg/transmission-gtk.exp index 0b7d87b07..3e497f9e0 100755 --- a/test/apps-x11-xorg/transmission-gtk.exp +++ b/test/apps-x11-xorg/transmission-gtk.exp | |||
@@ -33,7 +33,7 @@ expect { | |||
33 | send -- "firejail --name=blablabla\r" | 33 | send -- "firejail --name=blablabla\r" |
34 | expect { | 34 | expect { |
35 | timeout {puts "TESTING ERROR 4\n";exit} | 35 | timeout {puts "TESTING ERROR 4\n";exit} |
36 | "Child process initialized" | 36 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
37 | } | 37 | } |
38 | sleep 2 | 38 | sleep 2 |
39 | 39 | ||
diff --git a/test/apps-x11-xorg/transmission-qt.exp b/test/apps-x11-xorg/transmission-qt.exp index ef036b569..0642d3d32 100755 --- a/test/apps-x11-xorg/transmission-qt.exp +++ b/test/apps-x11-xorg/transmission-qt.exp | |||
@@ -33,7 +33,7 @@ expect { | |||
33 | send -- "firejail --name=blablabla\r" | 33 | send -- "firejail --name=blablabla\r" |
34 | expect { | 34 | expect { |
35 | timeout {puts "TESTING ERROR 4\n";exit} | 35 | timeout {puts "TESTING ERROR 4\n";exit} |
36 | "Child process initialized" | 36 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
37 | } | 37 | } |
38 | sleep 2 | 38 | sleep 2 |
39 | 39 | ||
diff --git a/test/apps-x11/chromium.exp b/test/apps-x11/chromium.exp index 227ce66a1..059fd0ad7 100755 --- a/test/apps-x11/chromium.exp +++ b/test/apps-x11/chromium.exp | |||
@@ -32,7 +32,7 @@ expect { | |||
32 | send -- "firejail --name=blablabla\r" | 32 | send -- "firejail --name=blablabla\r" |
33 | expect { | 33 | expect { |
34 | timeout {puts "TESTING ERROR 4\n";exit} | 34 | timeout {puts "TESTING ERROR 4\n";exit} |
35 | "Child process initialized" | 35 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
36 | } | 36 | } |
37 | sleep 2 | 37 | sleep 2 |
38 | 38 | ||
diff --git a/test/apps-x11/firefox.exp b/test/apps-x11/firefox.exp index 7861187ed..ac177211d 100755 --- a/test/apps-x11/firefox.exp +++ b/test/apps-x11/firefox.exp | |||
@@ -36,7 +36,7 @@ expect { | |||
36 | send -- "firejail --name=blablabla\r" | 36 | send -- "firejail --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/apps-x11/thunderbird.exp b/test/apps-x11/thunderbird.exp index d9c4ca396..391dc52e3 100755 --- a/test/apps-x11/thunderbird.exp +++ b/test/apps-x11/thunderbird.exp | |||
@@ -33,7 +33,7 @@ expect { | |||
33 | send -- "firejail --name=blablabla\r" | 33 | send -- "firejail --name=blablabla\r" |
34 | expect { | 34 | expect { |
35 | timeout {puts "TESTING ERROR 4\n";exit} | 35 | timeout {puts "TESTING ERROR 4\n";exit} |
36 | "Child process initialized" | 36 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
37 | } | 37 | } |
38 | sleep 2 | 38 | sleep 2 |
39 | 39 | ||
diff --git a/test/apps-x11/transmission-gtk.exp b/test/apps-x11/transmission-gtk.exp index a87b76582..21bc4a8bc 100755 --- a/test/apps-x11/transmission-gtk.exp +++ b/test/apps-x11/transmission-gtk.exp | |||
@@ -33,7 +33,7 @@ expect { | |||
33 | send -- "firejail --name=blablabla\r" | 33 | send -- "firejail --name=blablabla\r" |
34 | expect { | 34 | expect { |
35 | timeout {puts "TESTING ERROR 4\n";exit} | 35 | timeout {puts "TESTING ERROR 4\n";exit} |
36 | "Child process initialized" | 36 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
37 | } | 37 | } |
38 | sleep 2 | 38 | sleep 2 |
39 | 39 | ||
diff --git a/test/apps-x11/x11-none.exp b/test/apps-x11/x11-none.exp index d2cc69c98..e6ff12f27 100755 --- a/test/apps-x11/x11-none.exp +++ b/test/apps-x11/x11-none.exp | |||
@@ -17,7 +17,7 @@ sleep 1 | |||
17 | send -- "firejail --name=test --net=none --x11=none\r" | 17 | send -- "firejail --name=test --net=none --x11=none\r" |
18 | expect { | 18 | expect { |
19 | timeout {puts "TESTING ERROR 1\n";exit} | 19 | timeout {puts "TESTING ERROR 1\n";exit} |
20 | "Child process initialized" | 20 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
21 | } | 21 | } |
22 | sleep 1 | 22 | sleep 1 |
23 | 23 | ||
diff --git a/test/apps-x11/x11-xephyr.exp b/test/apps-x11/x11-xephyr.exp index e3c5f2742..f0090d713 100755 --- a/test/apps-x11/x11-xephyr.exp +++ b/test/apps-x11/x11-xephyr.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=test --x11=xephyr xterm\r" | 10 | send -- "firejail --name=test --x11=xephyr xterm\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | 15 | ||
16 | exit | 16 | exit |
@@ -28,7 +28,7 @@ sleep 1 | |||
28 | send -- "firejail --name=test --net=none --x11=none\r" | 28 | send -- "firejail --name=test --net=none --x11=none\r" |
29 | expect { | 29 | expect { |
30 | timeout {puts "TESTING ERROR 1\n";exit} | 30 | timeout {puts "TESTING ERROR 1\n";exit} |
31 | "Child process initialized" | 31 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
32 | } | 32 | } |
33 | sleep 1 | 33 | sleep 1 |
34 | 34 | ||
diff --git a/test/apps-x11/xterm-xephyr.exp b/test/apps-x11/xterm-xephyr.exp index 0e2bc8fc4..3db6cf793 100755 --- a/test/apps-x11/xterm-xephyr.exp +++ b/test/apps-x11/xterm-xephyr.exp | |||
@@ -33,7 +33,7 @@ expect { | |||
33 | send -- "firejail --name=blablabla\r" | 33 | send -- "firejail --name=blablabla\r" |
34 | expect { | 34 | expect { |
35 | timeout {puts "TESTING ERROR 4\n";exit} | 35 | timeout {puts "TESTING ERROR 4\n";exit} |
36 | "Child process initialized" | 36 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
37 | } | 37 | } |
38 | sleep 2 | 38 | sleep 2 |
39 | 39 | ||
diff --git a/test/apps-x11/xterm-xorg.exp b/test/apps-x11/xterm-xorg.exp index 269ab35bf..409b39f40 100755 --- a/test/apps-x11/xterm-xorg.exp +++ b/test/apps-x11/xterm-xorg.exp | |||
@@ -33,7 +33,7 @@ expect { | |||
33 | send -- "firejail --name=blablabla\r" | 33 | send -- "firejail --name=blablabla\r" |
34 | expect { | 34 | expect { |
35 | timeout {puts "TESTING ERROR 4\n";exit} | 35 | timeout {puts "TESTING ERROR 4\n";exit} |
36 | "Child process initialized" | 36 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
37 | } | 37 | } |
38 | sleep 2 | 38 | sleep 2 |
39 | 39 | ||
diff --git a/test/apps-x11/xterm-xpra.exp b/test/apps-x11/xterm-xpra.exp index 187d408f4..4acf780ac 100755 --- a/test/apps-x11/xterm-xpra.exp +++ b/test/apps-x11/xterm-xpra.exp | |||
@@ -33,7 +33,7 @@ expect { | |||
33 | send -- "firejail --name=blablabla\r" | 33 | send -- "firejail --name=blablabla\r" |
34 | expect { | 34 | expect { |
35 | timeout {puts "TESTING ERROR 4\n";exit} | 35 | timeout {puts "TESTING ERROR 4\n";exit} |
36 | "Child process initialized" | 36 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
37 | } | 37 | } |
38 | sleep 2 | 38 | sleep 2 |
39 | 39 | ||
diff --git a/test/apps/chromium.exp b/test/apps/chromium.exp index 0248f9d88..4e036dee9 100755 --- a/test/apps/chromium.exp +++ b/test/apps/chromium.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 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/apps/deluge.exp b/test/apps/deluge.exp index efe964b75..5df35fce4 100755 --- a/test/apps/deluge.exp +++ b/test/apps/deluge.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 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/apps/fbreader.exp b/test/apps/fbreader.exp index 1d5c6df79..ebb21bcf2 100755 --- a/test/apps/fbreader.exp +++ b/test/apps/fbreader.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/apps/filezilla.exp b/test/apps/filezilla.exp index b1397278c..397904860 100755 --- a/test/apps/filezilla.exp +++ b/test/apps/filezilla.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/apps/firefox.exp b/test/apps/firefox.exp index 706e97e18..f09c76b5d 100755 --- a/test/apps/firefox.exp +++ b/test/apps/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\r" | 47 | send -- "firejail --name=blablabla\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/apps/gnome-mplayer.exp b/test/apps/gnome-mplayer.exp index 64530e957..4d7ccff81 100755 --- a/test/apps/gnome-mplayer.exp +++ b/test/apps/gnome-mplayer.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 5 | 19 | sleep 5 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/apps/gthumb.exp b/test/apps/gthumb.exp index 4a381677f..0da1572b2 100755 --- a/test/apps/gthumb.exp +++ b/test/apps/gthumb.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/apps/hexchat.exp b/test/apps/hexchat.exp index 20d8dbd0f..8ed823dd5 100755 --- a/test/apps/hexchat.exp +++ b/test/apps/hexchat.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/apps/kcalc.exp b/test/apps/kcalc.exp index 6c2769b8f..d7251eec1 100755 --- a/test/apps/kcalc.exp +++ b/test/apps/kcalc.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/apps/ktorrent.exp b/test/apps/ktorrent.exp index 98f51dcd5..efa3f1d08 100755 --- a/test/apps/ktorrent.exp +++ b/test/apps/ktorrent.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/apps/midori.exp b/test/apps/midori.exp index 1c6ac59a2..431b43f8d 100755 --- a/test/apps/midori.exp +++ b/test/apps/midori.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 5 | 19 | sleep 5 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/apps/opera.exp b/test/apps/opera.exp index 40520f9f5..b0d1f3b9d 100755 --- a/test/apps/opera.exp +++ b/test/apps/opera.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 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/apps/qbittorrent.exp b/test/apps/qbittorrent.exp index 32d35997b..842e47986 100755 --- a/test/apps/qbittorrent.exp +++ b/test/apps/qbittorrent.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/apps/thunderbird.exp b/test/apps/thunderbird.exp index ba7b3abee..2b93835b6 100755 --- a/test/apps/thunderbird.exp +++ b/test/apps/thunderbird.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 5 | 19 | sleep 5 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/apps/transmission-qt.exp b/test/apps/transmission-qt.exp index 18bd6c469..90b0ef4ac 100755 --- a/test/apps/transmission-qt.exp +++ b/test/apps/transmission-qt.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/apps/uget-gtk.exp b/test/apps/uget-gtk.exp index 6ba56d193..21b859ee2 100755 --- a/test/apps/uget-gtk.exp +++ b/test/apps/uget-gtk.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/apps/vlc.exp b/test/apps/vlc.exp index 6114c2ee4..a0aed9cc9 100755 --- a/test/apps/vlc.exp +++ b/test/apps/vlc.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/apps/wine.exp b/test/apps/wine.exp index 58f2adcb6..e2a08089f 100755 --- a/test/apps/wine.exp +++ b/test/apps/wine.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 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 2\n";exit} | 20 | timeout {puts "TESTING ERROR 2\n";exit} |
diff --git a/test/apps/xchat.exp b/test/apps/xchat.exp index f5e0b545b..ca17f44e4 100755 --- a/test/apps/xchat.exp +++ b/test/apps/xchat.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/chroot/fs_chroot.exp b/test/chroot/fs_chroot.exp index 86864bc5b..c379e389c 100755 --- a/test/chroot/fs_chroot.exp +++ b/test/chroot/fs_chroot.exp | |||
@@ -11,7 +11,7 @@ send -- "firejail --chroot=/tmp/chroot\r" | |||
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Error: --chroot option is not available on Grsecurity systems" {puts "\nall done\n"; exit} | 13 | "Error: --chroot option is not available on Grsecurity systems" {puts "\nall done\n"; exit} |
14 | "Child process initialized" {puts "chroot available\n"}; | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "chroot available\n"}; |
15 | } | 15 | } |
16 | sleep 1 | 16 | sleep 1 |
17 | 17 | ||
diff --git a/test/chroot/unchroot-as-root.exp b/test/chroot/unchroot-as-root.exp index aed2f8a62..f67590768 100755 --- a/test/chroot/unchroot-as-root.exp +++ b/test/chroot/unchroot-as-root.exp | |||
@@ -11,7 +11,7 @@ send -- "firejail --chroot=/tmp/chroot\r" | |||
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Error: --chroot option is not available on Grsecurity systems" {puts "\nall done\n"; exit} | 13 | "Error: --chroot option is not available on Grsecurity systems" {puts "\nall done\n"; exit} |
14 | "Child process initialized" {puts "chroot available\n"}; | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "chroot available\n"}; |
15 | } | 15 | } |
16 | sleep 1 | 16 | sleep 1 |
17 | 17 | ||
diff --git a/test/environment/allow-debuggers.exp b/test/environment/allow-debuggers.exp index 412e24e9b..f972b5788 100755 --- a/test/environment/allow-debuggers.exp +++ b/test/environment/allow-debuggers.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --allow-debuggers\r" | 11 | send -- "firejail --allow-debuggers\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" { puts "\n"} | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" { puts "\n"} |
15 | "is disabled on Linux kernels prior to 4.8" { puts "TESTING SKIP: kernel too old\n"; exit } | 15 | "is disabled on Linux kernels prior to 4.8" { puts "TESTING SKIP: kernel too old\n"; exit } |
16 | } | 16 | } |
17 | after 100 | 17 | after 100 |
diff --git a/test/environment/csh.exp b/test/environment/csh.exp index eedb1bab7..31bfbfa40 100755 --- a/test/environment/csh.exp +++ b/test/environment/csh.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --private --shell=/bin/csh\r" | 11 | send -- "firejail --private --shell=/bin/csh\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 1 | 16 | sleep 1 |
17 | 17 | ||
diff --git a/test/environment/dash.exp b/test/environment/dash.exp index c2ece31f0..4dd5cac9f 100755 --- a/test/environment/dash.exp +++ b/test/environment/dash.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --private --tracelog --shell=/bin/dash\r" | 11 | send -- "firejail --private --tracelog --shell=/bin/dash\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 1 | 16 | sleep 1 |
17 | 17 | ||
diff --git a/test/environment/deterministic-exit-code.exp b/test/environment/deterministic-exit-code.exp index d7585c401..9f5be2c3d 100755 --- a/test/environment/deterministic-exit-code.exp +++ b/test/environment/deterministic-exit-code.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail\r" | 10 | send -- "firejail\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -32,7 +32,7 @@ after 100 | |||
32 | send -- "firejail --deterministic-exit-code\r" | 32 | send -- "firejail --deterministic-exit-code\r" |
33 | expect { | 33 | expect { |
34 | timeout {puts "TESTING ERROR 3\n";exit} | 34 | timeout {puts "TESTING ERROR 3\n";exit} |
35 | "Child process initialized" | 35 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
36 | } | 36 | } |
37 | sleep 1 | 37 | sleep 1 |
38 | 38 | ||
diff --git a/test/environment/dns.exp b/test/environment/dns.exp index 1fe6449b7..b5a8c119b 100755 --- a/test/environment/dns.exp +++ b/test/environment/dns.exp | |||
@@ -30,7 +30,7 @@ expect { | |||
30 | } | 30 | } |
31 | expect { | 31 | expect { |
32 | timeout {puts "TESTING ERROR 1.5\n";exit} | 32 | timeout {puts "TESTING ERROR 1.5\n";exit} |
33 | "Child process initialized" | 33 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
34 | } | 34 | } |
35 | expect { | 35 | expect { |
36 | timeout {puts "TESTING ERROR 1.6\n";exit} | 36 | timeout {puts "TESTING ERROR 1.6\n";exit} |
@@ -47,7 +47,7 @@ expect { | |||
47 | "DNS server 8.8.8.8" {puts "TESTING ERROR 2.3\n";exit} | 47 | "DNS server 8.8.8.8" {puts "TESTING ERROR 2.3\n";exit} |
48 | "DNS server 4.2.2.1" {puts "TESTING ERROR 2.4\n";exit} | 48 | "DNS server 4.2.2.1" {puts "TESTING ERROR 2.4\n";exit} |
49 | "DNS server ::2" {puts "TESTING ERROR 2.5\n";exit} | 49 | "DNS server ::2" {puts "TESTING ERROR 2.5\n";exit} |
50 | "Child process initialized" {puts "TESTING ERROR 2.6\n";exit} | 50 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "TESTING ERROR 2.6\n";exit} |
51 | "Parent is shutting down, bye..." {puts "TESTING ERROR 2.7\n";exit} | 51 | "Parent is shutting down, bye..." {puts "TESTING ERROR 2.7\n";exit} |
52 | "root" | 52 | "root" |
53 | } | 53 | } |
@@ -56,7 +56,7 @@ after 100 | |||
56 | send -- "firejail --dns=8.8.4.4 --dns=8.8.8.8 --dns=4.2.2.1 --dns=::2\r" | 56 | send -- "firejail --dns=8.8.4.4 --dns=8.8.8.8 --dns=4.2.2.1 --dns=::2\r" |
57 | expect { | 57 | expect { |
58 | timeout {puts "TESTING ERROR 3\n";exit} | 58 | timeout {puts "TESTING ERROR 3\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 | ||
@@ -85,7 +85,7 @@ sleep 1 | |||
85 | send -- "firejail --profile=dns.profile\r" | 85 | send -- "firejail --profile=dns.profile\r" |
86 | expect { | 86 | expect { |
87 | timeout {puts "TESTING ERROR 5.1\n";exit} | 87 | timeout {puts "TESTING ERROR 5.1\n";exit} |
88 | "Child process initialized" | 88 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
89 | } | 89 | } |
90 | sleep 1 | 90 | sleep 1 |
91 | 91 | ||
diff --git a/test/environment/doubledash.exp b/test/environment/doubledash.exp index 1a9ecebe1..dd2725426 100755 --- a/test/environment/doubledash.exp +++ b/test/environment/doubledash.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail -- ls -- -testdir\r" | 10 | send -- "firejail -- ls -- -testdir\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | expect { | 15 | expect { |
16 | timeout {puts "TESTING ERROR 2\n";exit} | 16 | timeout {puts "TESTING ERROR 2\n";exit} |
@@ -26,7 +26,7 @@ sleep 1 | |||
26 | send -- "firejail --name=testing -- -testdir/bash\r" | 26 | send -- "firejail --name=testing -- -testdir/bash\r" |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 4\n";exit} | 28 | timeout {puts "TESTING ERROR 4\n";exit} |
29 | "Child process initialized" | 29 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
30 | } | 30 | } |
31 | sleep 3 | 31 | sleep 3 |
32 | 32 | ||
diff --git a/test/environment/env.exp b/test/environment/env.exp index b5ebe883c..9394f2066 100755 --- a/test/environment/env.exp +++ b/test/environment/env.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --env=ENV1=env1 --env=ENV2=env2 --env=ENV3=env3\r" | 11 | send -- "firejail --env=ENV1=env1 --env=ENV2=env2 --env=ENV3=env3\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 1 | 16 | sleep 1 |
17 | 17 | ||
@@ -37,7 +37,7 @@ after 100 | |||
37 | send -- "firejail --profile=env.profile\r" | 37 | send -- "firejail --profile=env.profile\r" |
38 | expect { | 38 | expect { |
39 | timeout {puts "TESTING ERROR 4\n";exit} | 39 | timeout {puts "TESTING ERROR 4\n";exit} |
40 | "Child process initialized" | 40 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
41 | } | 41 | } |
42 | sleep 1 | 42 | sleep 1 |
43 | send -- "env | grep LD_LIBRARY_PATH\r" | 43 | send -- "env | grep LD_LIBRARY_PATH\r" |
diff --git a/test/environment/extract_command.exp b/test/environment/extract_command.exp index e719e6658..45ff1f291 100755 --- a/test/environment/extract_command.exp +++ b/test/environment/extract_command.exp | |||
@@ -14,7 +14,7 @@ expect { | |||
14 | } | 14 | } |
15 | expect { | 15 | expect { |
16 | timeout {puts "TESTING ERROR 2\n";exit} | 16 | timeout {puts "TESTING ERROR 2\n";exit} |
17 | "Child process initialized" | 17 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
18 | } | 18 | } |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 2\n";exit} | 20 | timeout {puts "TESTING ERROR 2\n";exit} |
diff --git a/test/environment/firejail-in-firejail.exp b/test/environment/firejail-in-firejail.exp index 10d5c9074..4a60d5611 100755 --- a/test/environment/firejail-in-firejail.exp +++ b/test/environment/firejail-in-firejail.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail\r" | 10 | send -- "firejail\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/environment/hostfile.exp b/test/environment/hostfile.exp index 709eb5d36..ccc8d049e 100755 --- a/test/environment/hostfile.exp +++ b/test/environment/hostfile.exp | |||
@@ -15,7 +15,7 @@ expect { | |||
15 | } | 15 | } |
16 | expect { | 16 | expect { |
17 | timeout {puts "TESTING ERROR 2\n";exit} | 17 | timeout {puts "TESTING ERROR 2\n";exit} |
18 | "Child process initialized" | 18 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
19 | } | 19 | } |
20 | after 100 | 20 | after 100 |
21 | 21 | ||
diff --git a/test/environment/ibus.exp b/test/environment/ibus.exp index e6095dc44..e9dd290a1 100755 --- a/test/environment/ibus.exp +++ b/test/environment/ibus.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail\r" | 11 | send -- "firejail\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 | after 100 | 16 | after 100 |
17 | 17 | ||
diff --git a/test/environment/keep-fd.exp b/test/environment/keep-fd.exp index 222234ceb..440cbd860 100755 --- a/test/environment/keep-fd.exp +++ b/test/environment/keep-fd.exp | |||
@@ -47,7 +47,7 @@ after 100 | |||
47 | send -- "firejail --noprofile\r" | 47 | send -- "firejail --noprofile\r" |
48 | expect { | 48 | expect { |
49 | timeout {puts "TESTING ERROR 2\n";exit} | 49 | timeout {puts "TESTING ERROR 2\n";exit} |
50 | "Child process initialized" | 50 | -re {Child process initialized in [0-9]+.[0-9]+ ms} |
51 | } | 51 | } |
52 | after 100 | 52 | after 100 |
53 | 53 | ||
@@ -83,7 +83,7 @@ after 500 | |||
83 | send -- "firejail --noprofile --keep-fd=\$READ_FD\r" | 83 | send -- "firejail --noprofile --keep-fd=\$READ_FD\r" |
84 | expect { | 84 | expect { |
85 | timeout {puts "TESTING ERROR 6\n";exit} | 85 | timeout {puts "TESTING ERROR 6\n";exit} |
86 | "Child process initialized" | 86 | -re {Child process initialized in [0-9]+.[0-9]+ ms} |
87 | } | 87 | } |
88 | after 100 | 88 | after 100 |
89 | 89 | ||
@@ -119,7 +119,7 @@ after 500 | |||
119 | send -- "firejail --noprofile --keep-fd=\$WRITE_FD\r" | 119 | send -- "firejail --noprofile --keep-fd=\$WRITE_FD\r" |
120 | expect { | 120 | expect { |
121 | timeout {puts "TESTING ERROR 10\n";exit} | 121 | timeout {puts "TESTING ERROR 10\n";exit} |
122 | "Child process initialized" | 122 | -re {Child process initialized in [0-9]+.[0-9]+ ms} |
123 | } | 123 | } |
124 | after 100 | 124 | after 100 |
125 | 125 | ||
@@ -155,7 +155,7 @@ after 500 | |||
155 | send -- "firejail --noprofile --keep-fd=\$READ_FD,\$WRITE_FD\r" | 155 | send -- "firejail --noprofile --keep-fd=\$READ_FD,\$WRITE_FD\r" |
156 | expect { | 156 | expect { |
157 | timeout {puts "TESTING ERROR 14\n";exit} | 157 | timeout {puts "TESTING ERROR 14\n";exit} |
158 | "Child process initialized" | 158 | -re {Child process initialized in [0-9]+.[0-9]+ ms} |
159 | } | 159 | } |
160 | after 100 | 160 | after 100 |
161 | 161 | ||
@@ -191,7 +191,7 @@ after 500 | |||
191 | send -- "firejail --noprofile --keep-fd=all\r" | 191 | send -- "firejail --noprofile --keep-fd=all\r" |
192 | expect { | 192 | expect { |
193 | timeout {puts "TESTING ERROR 18\n";exit} | 193 | timeout {puts "TESTING ERROR 18\n";exit} |
194 | "Child process initialized" | 194 | -re {Child process initialized in [0-9]+.[0-9]+ ms} |
195 | } | 195 | } |
196 | after 100 | 196 | after 100 |
197 | 197 | ||
diff --git a/test/environment/machineid.exp b/test/environment/machineid.exp index b7eb5c911..2392dc9d6 100755 --- a/test/environment/machineid.exp +++ b/test/environment/machineid.exp | |||
@@ -15,7 +15,7 @@ expect { | |||
15 | } | 15 | } |
16 | expect { | 16 | expect { |
17 | timeout {puts "TESTING ERROR 1\n";exit} | 17 | timeout {puts "TESTING ERROR 1\n";exit} |
18 | "Child process initialized" | 18 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
19 | } | 19 | } |
20 | after 100 | 20 | after 100 |
21 | send -- "exit\r" | 21 | send -- "exit\r" |
diff --git a/test/environment/nice.exp b/test/environment/nice.exp index 69e641448..823d10c67 100755 --- a/test/environment/nice.exp +++ b/test/environment/nice.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --nice=15\r" | 10 | send -- "firejail --nice=15\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -39,7 +39,7 @@ after 100 | |||
39 | send -- "firejail --profile=nice.profile\r" | 39 | send -- "firejail --profile=nice.profile\r" |
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 10\n";exit} | 41 | timeout {puts "TESTING ERROR 10\n";exit} |
42 | "Child process initialized" | 42 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
43 | } | 43 | } |
44 | sleep 1 | 44 | sleep 1 |
45 | 45 | ||
@@ -70,7 +70,7 @@ after 100 | |||
70 | send -- "firejail --nice=-5\r" | 70 | send -- "firejail --nice=-5\r" |
71 | expect { | 71 | expect { |
72 | timeout {puts "TESTING ERROR 17\n";exit} | 72 | timeout {puts "TESTING ERROR 17\n";exit} |
73 | "Child process initialized" | 73 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
74 | } | 74 | } |
75 | sleep 1 | 75 | sleep 1 |
76 | 76 | ||
diff --git a/test/environment/rlimit-join.exp b/test/environment/rlimit-join.exp index 42a8df390..9e7161241 100755 --- a/test/environment/rlimit-join.exp +++ b/test/environment/rlimit-join.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --noprofile --name=\"rlimit testing\"\r" | 11 | send -- "firejail --noprofile --name=\"rlimit testing\"\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 1 | 16 | sleep 1 |
17 | 17 | ||
@@ -21,11 +21,15 @@ 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 | 29 | ||
26 | send -- "cat /proc/self/limits\r" | 30 | send -- "cat /proc/self/limits\r" |
27 | expect { | 31 | expect { |
28 | timeout {puts "TESTING ERROR 2\n";exit} | 32 | timeout {puts "TESTING ERROR 3\n";exit} |
29 | "Max open files 1234 1234" | 33 | "Max open files 1234 1234" |
30 | } | 34 | } |
31 | after 100 | 35 | after 100 |
diff --git a/test/environment/rlimit-profile.exp b/test/environment/rlimit-profile.exp index d0365d5e3..762f70ba9 100755 --- a/test/environment/rlimit-profile.exp +++ b/test/environment/rlimit-profile.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --profile=rlimit.profile\r" | 11 | send -- "firejail --profile=rlimit.profile\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 1 | 16 | sleep 1 |
17 | 17 | ||
diff --git a/test/environment/rlimit.exp b/test/environment/rlimit.exp index 3bdbab4c2..acc87277b 100755 --- a/test/environment/rlimit.exp +++ b/test/environment/rlimit.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --rlimit-fsize=1024 --rlimit-nproc=1000 --rlimit-nofile=500 --rlimit-sigpending=200 --rlimit-as=1234567890\r" | 11 | send -- "firejail --rlimit-fsize=1024 --rlimit-nproc=1000 --rlimit-nofile=500 --rlimit-sigpending=200 --rlimit-as=1234567890\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 1 | 16 | sleep 1 |
17 | 17 | ||
diff --git a/test/environment/shell-none.exp b/test/environment/shell-none.exp index 0af1bb88b..512e2efc2 100755 --- a/test/environment/shell-none.exp +++ b/test/environment/shell-none.exp | |||
@@ -24,7 +24,7 @@ after 100 | |||
24 | send -- "firejail --shell=none ls\r" | 24 | send -- "firejail --shell=none ls\r" |
25 | expect { | 25 | expect { |
26 | timeout {puts "TESTING ERROR 2\n";exit} | 26 | timeout {puts "TESTING ERROR 2\n";exit} |
27 | "Child process initialized" | 27 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
28 | } | 28 | } |
29 | expect { | 29 | expect { |
30 | timeout {puts "TESTING ERROR 3\n";exit} | 30 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -35,7 +35,7 @@ after 100 | |||
35 | send -- "firejail --profile=shell-none.profile ls\r" | 35 | send -- "firejail --profile=shell-none.profile ls\r" |
36 | expect { | 36 | expect { |
37 | timeout {puts "TESTING ERROR 4\n";exit} | 37 | timeout {puts "TESTING ERROR 4\n";exit} |
38 | "Child process initialized" | 38 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
39 | } | 39 | } |
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 5\n";exit} | 41 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/environment/sound.exp b/test/environment/sound.exp index 784cdfe1b..7ee1c74d7 100755 --- a/test/environment/sound.exp +++ b/test/environment/sound.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --nosound speaker-test\r" | 11 | send -- "firejail --nosound speaker-test\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 | expect { | 16 | expect { |
17 | timeout {puts "TESTING ERROR 2\n";exit} | 17 | timeout {puts "TESTING ERROR 2\n";exit} |
@@ -22,7 +22,7 @@ sleep 2 | |||
22 | send -- "firejail --nosound aplay -l\r" | 22 | send -- "firejail --nosound aplay -l\r" |
23 | expect { | 23 | expect { |
24 | timeout {puts "TESTING ERROR 3\n";exit} | 24 | timeout {puts "TESTING ERROR 3\n";exit} |
25 | "Child process initialized" | 25 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
26 | } | 26 | } |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 4\n";exit} | 28 | timeout {puts "TESTING ERROR 4\n";exit} |
@@ -39,7 +39,7 @@ sleep 2 | |||
39 | send -- "firejail --profile=sound.profile speaker-test\r" | 39 | send -- "firejail --profile=sound.profile speaker-test\r" |
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 11\n";exit} | 41 | timeout {puts "TESTING ERROR 11\n";exit} |
42 | "Child process initialized" | 42 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
43 | } | 43 | } |
44 | expect { | 44 | expect { |
45 | timeout {puts "TESTING ERROR 12\n";exit} | 45 | timeout {puts "TESTING ERROR 12\n";exit} |
@@ -50,7 +50,7 @@ sleep 2 | |||
50 | send -- "firejail --profile=sound.profile aplay -l\r" | 50 | send -- "firejail --profile=sound.profile aplay -l\r" |
51 | expect { | 51 | expect { |
52 | timeout {puts "TESTING ERROR 13\n";exit} | 52 | timeout {puts "TESTING ERROR 13\n";exit} |
53 | "Child process initialized" | 53 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
54 | } | 54 | } |
55 | expect { | 55 | expect { |
56 | timeout {puts "TESTING ERROR 14\n";exit} | 56 | timeout {puts "TESTING ERROR 14\n";exit} |
@@ -67,7 +67,7 @@ sleep 2 | |||
67 | send -- "firejail aplay -l\r" | 67 | send -- "firejail aplay -l\r" |
68 | expect { | 68 | expect { |
69 | timeout {puts "TESTING ERROR 23\n";exit} | 69 | timeout {puts "TESTING ERROR 23\n";exit} |
70 | "Child process initialized" | 70 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
71 | } | 71 | } |
72 | expect { | 72 | expect { |
73 | timeout {puts "TESTING ERROR 24\n";exit} | 73 | timeout {puts "TESTING ERROR 24\n";exit} |
diff --git a/test/environment/timeout.exp b/test/environment/timeout.exp index 901bed2e8..b38881c81 100755 --- a/test/environment/timeout.exp +++ b/test/environment/timeout.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "time firejail --timeout=00:00:05\r" | 10 | send -- "time firejail --timeout=00:00:05\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/environment/umask.exp b/test/environment/umask.exp index d336ed2cd..46bd80a92 100755 --- a/test/environment/umask.exp +++ b/test/environment/umask.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --noprofile\r" | 10 | send -- "firejail --noprofile\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/environment/zsh.exp b/test/environment/zsh.exp index 13eee3433..9f871ea54 100755 --- a/test/environment/zsh.exp +++ b/test/environment/zsh.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --private --shell=/bin/zsh\r" | 11 | send -- "firejail --private --shell=/bin/zsh\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 1 | 16 | sleep 1 |
17 | 17 | ||
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 | ||
diff --git a/test/filters/apparmor.exp b/test/filters/apparmor.exp index c7e793ca3..13ce4dd06 100755 --- a/test/filters/apparmor.exp +++ b/test/filters/apparmor.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=test1 --apparmor\r" | 10 | send -- "firejail --name=test1 --apparmor\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -18,7 +18,7 @@ spawn $env(SHELL) | |||
18 | send -- "firejail --name=test2 --apparmor\r" | 18 | send -- "firejail --name=test2 --apparmor\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 1\n";exit} | 20 | timeout {puts "TESTING ERROR 1\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 | ||
diff --git a/test/filters/caps-join.exp b/test/filters/caps-join.exp index e9b5f59d0..921d6b695 100755 --- a/test/filters/caps-join.exp +++ b/test/filters/caps-join.exp | |||
@@ -20,7 +20,7 @@ set spawn_id $id1 | |||
20 | send -- "firejail --name=jointesting\r" | 20 | send -- "firejail --name=jointesting\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 | ||
@@ -44,7 +44,7 @@ set spawn_id $id1 | |||
44 | send -- "firejail --name=jointesting --noprofile\r" | 44 | send -- "firejail --name=jointesting --noprofile\r" |
45 | expect { | 45 | expect { |
46 | timeout {puts "TESTING ERROR 10\n";exit} | 46 | timeout {puts "TESTING ERROR 10\n";exit} |
47 | "Child process initialized" | 47 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
48 | } | 48 | } |
49 | sleep 1 | 49 | sleep 1 |
50 | 50 | ||
@@ -76,7 +76,7 @@ set spawn_id $id1 | |||
76 | send -- "firejail --name=jointesting --noprofile --caps.keep=chown,fowner\r" | 76 | send -- "firejail --name=jointesting --noprofile --caps.keep=chown,fowner\r" |
77 | expect { | 77 | expect { |
78 | timeout {puts "TESTING ERROR20\n";exit} | 78 | timeout {puts "TESTING ERROR20\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/filters/caps-print.exp b/test/filters/caps-print.exp index 8c51bb796..f4f2fc7ca 100755 --- a/test/filters/caps-print.exp +++ b/test/filters/caps-print.exp | |||
@@ -42,7 +42,7 @@ expect { | |||
42 | } | 42 | } |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 8\n";exit} | 44 | timeout {puts "TESTING ERROR 8\n";exit} |
45 | "Child process initialized" | 45 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
46 | } | 46 | } |
47 | sleep 1 | 47 | sleep 1 |
48 | 48 | ||
diff --git a/test/filters/caps.exp b/test/filters/caps.exp index c29794ea3..29437beea 100755 --- a/test/filters/caps.exp +++ b/test/filters/caps.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --caps.keep=chown,fowner --noprofile\r" | 10 | send -- "firejail --caps.keep=chown,fowner --noprofile\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | after 100 | 15 | after 100 |
16 | 16 | ||
@@ -29,7 +29,7 @@ sleep 1 | |||
29 | send -- "firejail --caps.drop=all --noprofile\r" | 29 | send -- "firejail --caps.drop=all --noprofile\r" |
30 | expect { | 30 | expect { |
31 | timeout {puts "TESTING ERROR 4\n";exit} | 31 | timeout {puts "TESTING ERROR 4\n";exit} |
32 | "Child process initialized" | 32 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
33 | } | 33 | } |
34 | after 100 | 34 | after 100 |
35 | 35 | ||
@@ -48,7 +48,7 @@ sleep 1 | |||
48 | send -- "firejail --caps.drop=chown,dac_override,dac_read_search,fowner --noprofile\r" | 48 | send -- "firejail --caps.drop=chown,dac_override,dac_read_search,fowner --noprofile\r" |
49 | expect { | 49 | expect { |
50 | timeout {puts "TESTING ERROR 7\n";exit} | 50 | timeout {puts "TESTING ERROR 7\n";exit} |
51 | "Child process initialized" | 51 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
52 | } | 52 | } |
53 | after 100 | 53 | after 100 |
54 | 54 | ||
@@ -81,7 +81,7 @@ expect { | |||
81 | expect { | 81 | expect { |
82 | timeout {puts "TESTING ERROR 13\n";exit} | 82 | timeout {puts "TESTING ERROR 13\n";exit} |
83 | "Drop CAP_" {puts "TESTING ERROR 14\n";exit} | 83 | "Drop CAP_" {puts "TESTING ERROR 14\n";exit} |
84 | "Child process initialized" | 84 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
85 | } | 85 | } |
86 | after 100 | 86 | after 100 |
87 | send -- "exit\r" | 87 | send -- "exit\r" |
@@ -93,7 +93,7 @@ sleep 1 | |||
93 | #send -- "firejail --profile=caps2.profile\r" | 93 | #send -- "firejail --profile=caps2.profile\r" |
94 | #expect { | 94 | #expect { |
95 | # timeout {puts "TESTING ERROR 15\n";exit} | 95 | # timeout {puts "TESTING ERROR 15\n";exit} |
96 | # "Child process initialized" | 96 | # -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
97 | #} | 97 | #} |
98 | #after 100 | 98 | #after 100 |
99 | # | 99 | # |
@@ -113,7 +113,7 @@ sleep 1 | |||
113 | send -- "firejail --profile=caps3.profile\r" | 113 | send -- "firejail --profile=caps3.profile\r" |
114 | expect { | 114 | expect { |
115 | timeout {puts "TESTING ERROR 18\n";exit} | 115 | timeout {puts "TESTING ERROR 18\n";exit} |
116 | "Child process initialized" | 116 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
117 | } | 117 | } |
118 | after 100 | 118 | after 100 |
119 | 119 | ||
diff --git a/test/filters/memwrexe-32.exp b/test/filters/memwrexe-32.exp index f7b59f43f..211052514 100755 --- a/test/filters/memwrexe-32.exp +++ b/test/filters/memwrexe-32.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --memory-deny-write-execute ./memwrexe-32 mmap\r" | 10 | send -- "firejail --memory-deny-write-execute ./memwrexe-32 mmap\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | expect { | 15 | expect { |
16 | timeout {puts "TESTING ERROR 1\n";exit} | 16 | timeout {puts "TESTING ERROR 1\n";exit} |
@@ -22,7 +22,7 @@ after 100 | |||
22 | send -- "firejail --memory-deny-write-execute ./memwrexe-32 mprotect\r" | 22 | send -- "firejail --memory-deny-write-execute ./memwrexe-32 mprotect\r" |
23 | expect { | 23 | expect { |
24 | timeout {puts "TESTING ERROR 10\n";exit} | 24 | timeout {puts "TESTING ERROR 10\n";exit} |
25 | "Child process initialized" | 25 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
26 | } | 26 | } |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 11\n";exit} | 28 | timeout {puts "TESTING ERROR 11\n";exit} |
@@ -34,7 +34,7 @@ after 100 | |||
34 | send -- "firejail --memory-deny-write-execute ./memwrexe-32 memfd_create\r" | 34 | send -- "firejail --memory-deny-write-execute ./memwrexe-32 memfd_create\r" |
35 | expect { | 35 | expect { |
36 | timeout {puts "TESTING ERROR 20\n";exit} | 36 | timeout {puts "TESTING ERROR 20\n";exit} |
37 | "Child process initialized" | 37 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
38 | } | 38 | } |
39 | expect { | 39 | expect { |
40 | timeout {puts "TESTING ERROR 21\n";exit} | 40 | timeout {puts "TESTING ERROR 21\n";exit} |
diff --git a/test/filters/memwrexe.exp b/test/filters/memwrexe.exp index 9d08509e9..950acbf50 100755 --- a/test/filters/memwrexe.exp +++ b/test/filters/memwrexe.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --memory-deny-write-execute ./memwrexe mmap\r" | 10 | send -- "firejail --memory-deny-write-execute ./memwrexe mmap\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | expect { | 15 | expect { |
16 | timeout {puts "TESTING ERROR 1\n";exit} | 16 | timeout {puts "TESTING ERROR 1\n";exit} |
@@ -22,7 +22,7 @@ after 100 | |||
22 | send -- "firejail --memory-deny-write-execute ./memwrexe mprotect\r" | 22 | send -- "firejail --memory-deny-write-execute ./memwrexe mprotect\r" |
23 | expect { | 23 | expect { |
24 | timeout {puts "TESTING ERROR 10\n";exit} | 24 | timeout {puts "TESTING ERROR 10\n";exit} |
25 | "Child process initialized" | 25 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
26 | } | 26 | } |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 11\n";exit} | 28 | timeout {puts "TESTING ERROR 11\n";exit} |
@@ -34,7 +34,7 @@ after 100 | |||
34 | send -- "firejail --memory-deny-write-execute ./memwrexe memfd_create\r" | 34 | send -- "firejail --memory-deny-write-execute ./memwrexe memfd_create\r" |
35 | expect { | 35 | expect { |
36 | timeout {puts "TESTING ERROR 20\n";exit} | 36 | timeout {puts "TESTING ERROR 20\n";exit} |
37 | "Child process initialized" | 37 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
38 | } | 38 | } |
39 | expect { | 39 | expect { |
40 | timeout {puts "TESTING ERROR 21\n";exit} | 40 | timeout {puts "TESTING ERROR 21\n";exit} |
diff --git a/test/filters/noroot.exp b/test/filters/noroot.exp index 504b17239..66e1e4e27 100755 --- a/test/filters/noroot.exp +++ b/test/filters/noroot.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=test --noroot --noprofile\r" | 10 | send -- "firejail --name=test --noroot --noprofile\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/filters/seccomp-chmod-profile.exp b/test/filters/seccomp-chmod-profile.exp index c754b48fa..ac16015cd 100755 --- a/test/filters/seccomp-chmod-profile.exp +++ b/test/filters/seccomp-chmod-profile.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --profile=seccomp.profile --private\r" | 10 | send -- "firejail --profile=seccomp.profile --private\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/filters/seccomp-chmod.exp b/test/filters/seccomp-chmod.exp index 39baa5533..913ea18a7 100755 --- a/test/filters/seccomp-chmod.exp +++ b/test/filters/seccomp-chmod.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --seccomp=chmod,fchmod,fchmodat --private\r" | 10 | send -- "firejail --seccomp=chmod,fchmod,fchmodat --private\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/filters/seccomp-chown.exp b/test/filters/seccomp-chown.exp index 553f164b1..be6c13e2d 100755 --- a/test/filters/seccomp-chown.exp +++ b/test/filters/seccomp-chown.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --seccomp=chown,fchown,fchownat,lchown --private\r" | 10 | send -- "firejail --seccomp=chown,fchown,fchownat,lchown --private\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
diff --git a/test/filters/seccomp-debug-32.exp b/test/filters/seccomp-debug-32.exp index a2f99c1ca..71d653c1f 100755 --- a/test/filters/seccomp-debug-32.exp +++ b/test/filters/seccomp-debug-32.exp | |||
@@ -21,7 +21,7 @@ expect { | |||
21 | } | 21 | } |
22 | expect { | 22 | expect { |
23 | timeout {puts "TESTING ERROR 3\n";exit} | 23 | timeout {puts "TESTING ERROR 3\n";exit} |
24 | "Child process initialized" | 24 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
25 | } | 25 | } |
26 | expect { | 26 | expect { |
27 | timeout {puts "TESTING ERROR 4\n";exit} | 27 | timeout {puts "TESTING ERROR 4\n";exit} |
@@ -36,7 +36,7 @@ expect { | |||
36 | timeout {puts "TESTING ERROR 10\n";exit} | 36 | timeout {puts "TESTING ERROR 10\n";exit} |
37 | "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" {puts "TESTING ERROR 11\n";exit} | 37 | "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" {puts "TESTING ERROR 11\n";exit} |
38 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 12\n";exit} | 38 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 12\n";exit} |
39 | "Child process initialized" | 39 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
40 | } | 40 | } |
41 | expect { | 41 | expect { |
42 | timeout {puts "TESTING ERROR 16\n";exit} | 42 | timeout {puts "TESTING ERROR 16\n";exit} |
@@ -48,7 +48,7 @@ after 100 | |||
48 | send -- "firejail --debug --ignore=protocol sleep 1; echo done\r" | 48 | send -- "firejail --debug --ignore=protocol sleep 1; echo done\r" |
49 | expect { | 49 | expect { |
50 | timeout {puts "TESTING ERROR 17\n";exit} | 50 | timeout {puts "TESTING ERROR 17\n";exit} |
51 | "Child process initialized" | 51 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
52 | } | 52 | } |
53 | expect { | 53 | expect { |
54 | timeout {puts "TESTING ERROR 19\n";exit} | 54 | timeout {puts "TESTING ERROR 19\n";exit} |
@@ -65,7 +65,7 @@ after 100 | |||
65 | send -- "firejail --debug --memory-deny-write-execute sleep 1; echo done\r" | 65 | send -- "firejail --debug --memory-deny-write-execute sleep 1; echo done\r" |
66 | expect { | 66 | expect { |
67 | timeout {puts "TESTING ERROR 24\n";exit} | 67 | timeout {puts "TESTING ERROR 24\n";exit} |
68 | "Child process initialized" | 68 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
69 | } | 69 | } |
70 | expect { | 70 | expect { |
71 | timeout {puts "TESTING ERROR 25\n";exit} | 71 | timeout {puts "TESTING ERROR 25\n";exit} |
@@ -82,7 +82,7 @@ send -- "firejail --debug --seccomp.block-secondary sleep 1; echo done\r" | |||
82 | expect { | 82 | expect { |
83 | timeout {puts "TESTING ERROR 27\n";exit} | 83 | timeout {puts "TESTING ERROR 27\n";exit} |
84 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 28\n";exit} | 84 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 28\n";exit} |
85 | "Child process initialized" | 85 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
86 | } | 86 | } |
87 | expect { | 87 | expect { |
88 | timeout {puts "TESTING ERROR 29\n";exit} | 88 | timeout {puts "TESTING ERROR 29\n";exit} |
@@ -105,7 +105,7 @@ send -- "firejail --debug --profile=block-secondary.profile sleep 1; echo done\ | |||
105 | expect { | 105 | expect { |
106 | timeout {puts "TESTING ERROR 33\n";exit} | 106 | timeout {puts "TESTING ERROR 33\n";exit} |
107 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 34\n";exit} | 107 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 34\n";exit} |
108 | "Child process initialized" | 108 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
109 | } | 109 | } |
110 | expect { | 110 | expect { |
111 | timeout {puts "TESTING ERROR 35\n";exit} | 111 | timeout {puts "TESTING ERROR 35\n";exit} |
diff --git a/test/filters/seccomp-debug.exp b/test/filters/seccomp-debug.exp index d2413697d..b4a9e158d 100755 --- a/test/filters/seccomp-debug.exp +++ b/test/filters/seccomp-debug.exp | |||
@@ -21,7 +21,7 @@ expect { | |||
21 | } | 21 | } |
22 | expect { | 22 | expect { |
23 | timeout {puts "TESTING ERROR 3\n";exit} | 23 | timeout {puts "TESTING ERROR 3\n";exit} |
24 | "Child process initialized" | 24 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
25 | } | 25 | } |
26 | expect { | 26 | expect { |
27 | timeout {puts "TESTING ERROR 4\n";exit} | 27 | timeout {puts "TESTING ERROR 4\n";exit} |
@@ -34,7 +34,7 @@ after 100 | |||
34 | send -- "firejail --debug sleep 1; echo done\r" | 34 | send -- "firejail --debug sleep 1; echo done\r" |
35 | expect { | 35 | expect { |
36 | timeout {puts "TESTING ERROR 5\n";exit} | 36 | timeout {puts "TESTING ERROR 5\n";exit} |
37 | "Child process initialized" | 37 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
38 | } | 38 | } |
39 | expect { | 39 | expect { |
40 | timeout {puts "TESTING ERROR 6\n";exit} | 40 | timeout {puts "TESTING ERROR 6\n";exit} |
@@ -60,7 +60,7 @@ expect { | |||
60 | timeout {puts "TESTING ERROR 10\n";exit} | 60 | timeout {puts "TESTING ERROR 10\n";exit} |
61 | "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" {puts "TESTING ERROR 11\n";exit} | 61 | "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" {puts "TESTING ERROR 11\n";exit} |
62 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 12\n";exit} | 62 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 12\n";exit} |
63 | "Child process initialized" | 63 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
64 | } | 64 | } |
65 | expect { | 65 | expect { |
66 | timeout {puts "TESTING ERROR 13\n";exit} | 66 | timeout {puts "TESTING ERROR 13\n";exit} |
@@ -79,7 +79,7 @@ send -- "firejail --debug --ignore=protocol sleep 1; echo done\r" | |||
79 | expect { | 79 | expect { |
80 | timeout {puts "TESTING ERROR 17\n";exit} | 80 | timeout {puts "TESTING ERROR 17\n";exit} |
81 | "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" {puts "TESTING ERROR 18\n";exit} | 81 | "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" {puts "TESTING ERROR 18\n";exit} |
82 | "Child process initialized" | 82 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
83 | } | 83 | } |
84 | expect { | 84 | expect { |
85 | timeout {puts "TESTING ERROR 19\n";exit} | 85 | timeout {puts "TESTING ERROR 19\n";exit} |
@@ -101,7 +101,7 @@ after 100 | |||
101 | send -- "firejail --debug --memory-deny-write-execute sleep 1; echo done\r" | 101 | send -- "firejail --debug --memory-deny-write-execute sleep 1; echo done\r" |
102 | expect { | 102 | expect { |
103 | timeout {puts "TESTING ERROR 24\n";exit} | 103 | timeout {puts "TESTING ERROR 24\n";exit} |
104 | "Child process initialized" | 104 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
105 | } | 105 | } |
106 | expect { | 106 | expect { |
107 | timeout {puts "TESTING ERROR 25\n";exit} | 107 | timeout {puts "TESTING ERROR 25\n";exit} |
@@ -118,7 +118,7 @@ send -- "firejail --debug --seccomp.block-secondary sleep 1; echo done\r" | |||
118 | expect { | 118 | expect { |
119 | timeout {puts "TESTING ERROR 27\n";exit} | 119 | timeout {puts "TESTING ERROR 27\n";exit} |
120 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 28\n";exit} | 120 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 28\n";exit} |
121 | "Child process initialized" | 121 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
122 | } | 122 | } |
123 | expect { | 123 | expect { |
124 | timeout {puts "TESTING ERROR 29\n";exit} | 124 | timeout {puts "TESTING ERROR 29\n";exit} |
@@ -141,7 +141,7 @@ send -- "firejail --debug --profile=block-secondary.profile sleep 1; echo done\ | |||
141 | expect { | 141 | expect { |
142 | timeout {puts "TESTING ERROR 33\n";exit} | 142 | timeout {puts "TESTING ERROR 33\n";exit} |
143 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 34\n";exit} | 143 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 34\n";exit} |
144 | "Child process initialized" | 144 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
145 | } | 145 | } |
146 | expect { | 146 | expect { |
147 | timeout {puts "TESTING ERROR 35\n";exit} | 147 | timeout {puts "TESTING ERROR 35\n";exit} |
diff --git a/test/filters/seccomp-empty.exp b/test/filters/seccomp-empty.exp index 79944b1ba..7a5597727 100755 --- a/test/filters/seccomp-empty.exp +++ b/test/filters/seccomp-empty.exp | |||
@@ -42,7 +42,7 @@ expect { | |||
42 | } | 42 | } |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 0.7\n";exit} | 44 | timeout {puts "TESTING ERROR 0.7\n";exit} |
45 | "Child process initialized" | 45 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
46 | } | 46 | } |
47 | sleep 2 | 47 | sleep 2 |
48 | send -- "exit\r" | 48 | send -- "exit\r" |
@@ -78,7 +78,7 @@ expect { | |||
78 | } | 78 | } |
79 | expect { | 79 | expect { |
80 | timeout {puts "TESTING ERROR 1.7\n";exit} | 80 | timeout {puts "TESTING ERROR 1.7\n";exit} |
81 | "Child process initialized" | 81 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
82 | } | 82 | } |
83 | sleep 2 | 83 | sleep 2 |
84 | send -- "exit\r" | 84 | send -- "exit\r" |
@@ -120,7 +120,7 @@ expect { | |||
120 | } | 120 | } |
121 | expect { | 121 | expect { |
122 | timeout {puts "TESTING ERROR 2.7\n";exit} | 122 | timeout {puts "TESTING ERROR 2.7\n";exit} |
123 | "Child process initialized" | 123 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
124 | } | 124 | } |
125 | sleep 2 | 125 | sleep 2 |
126 | send -- "exit\r" | 126 | send -- "exit\r" |
@@ -156,7 +156,7 @@ expect { | |||
156 | } | 156 | } |
157 | expect { | 157 | expect { |
158 | timeout {puts "TESTING ERROR 3.7\n";exit} | 158 | timeout {puts "TESTING ERROR 3.7\n";exit} |
159 | "Child process initialized" | 159 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
160 | } | 160 | } |
161 | sleep 2 | 161 | sleep 2 |
162 | send -- "exit\r" | 162 | send -- "exit\r" |
diff --git a/test/filters/seccomp-errno.exp b/test/filters/seccomp-errno.exp index 3b6759a40..f5e9ff402 100755 --- a/test/filters/seccomp-errno.exp +++ b/test/filters/seccomp-errno.exp | |||
@@ -31,7 +31,7 @@ sleep 1 | |||
31 | send -- "firejail --seccomp=unlinkat:ENOENT,mkdir:ENOENT\r" | 31 | send -- "firejail --seccomp=unlinkat:ENOENT,mkdir:ENOENT\r" |
32 | expect { | 32 | expect { |
33 | timeout {puts "TESTING ERROR 3\n";exit} | 33 | timeout {puts "TESTING ERROR 3\n";exit} |
34 | "Child process initialized" | 34 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
35 | } | 35 | } |
36 | sleep 1 | 36 | sleep 1 |
37 | send -- "rm seccomp-test-file\r" | 37 | send -- "rm seccomp-test-file\r" |
diff --git a/test/filters/seccomp-ptrace.exp b/test/filters/seccomp-ptrace.exp index c857527d6..9bde7355f 100755 --- a/test/filters/seccomp-ptrace.exp +++ b/test/filters/seccomp-ptrace.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --noprofile --seccomp\r" | 10 | send -- "firejail --noprofile --seccomp\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
diff --git a/test/filters/seccomp-su.exp b/test/filters/seccomp-su.exp index ddded4111..d204a4295 100755 --- a/test/filters/seccomp-su.exp +++ b/test/filters/seccomp-su.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --noprofile --seccomp\r" | 10 | send -- "firejail --noprofile --seccomp\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
diff --git a/test/fs/fs_dev_shm.exp b/test/fs/fs_dev_shm.exp index 0c819fe99..5d57a8975 100755 --- a/test/fs/fs_dev_shm.exp +++ b/test/fs/fs_dev_shm.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail\r" | 11 | send -- "firejail\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 | after 100 | 16 | after 100 |
17 | send -- "stty -echo\r" | 17 | send -- "stty -echo\r" |
@@ -52,7 +52,7 @@ sleep 1 | |||
52 | send -- "firejail\r" | 52 | send -- "firejail\r" |
53 | expect { | 53 | expect { |
54 | timeout {puts "TESTING ERROR 7\n";exit} | 54 | timeout {puts "TESTING ERROR 7\n";exit} |
55 | "Child process initialized" | 55 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
56 | } | 56 | } |
57 | after 100 | 57 | after 100 |
58 | send -- "stty -echo\r" | 58 | send -- "stty -echo\r" |
diff --git a/test/fs/fs_var_lock.exp b/test/fs/fs_var_lock.exp index e2efd389d..ce3eb836e 100755 --- a/test/fs/fs_var_lock.exp +++ b/test/fs/fs_var_lock.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail\r" | 11 | send -- "firejail\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 | after 100 | 16 | after 100 |
17 | send -- "stty -echo\r" | 17 | send -- "stty -echo\r" |
@@ -53,7 +53,7 @@ sleep 1 | |||
53 | send -- "firejail\r" | 53 | send -- "firejail\r" |
54 | expect { | 54 | expect { |
55 | timeout {puts "TESTING ERROR 7\n";exit} | 55 | timeout {puts "TESTING ERROR 7\n";exit} |
56 | "Child process initialized" | 56 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
57 | } | 57 | } |
58 | after 100 | 58 | after 100 |
59 | send -- "stty -echo\r" | 59 | send -- "stty -echo\r" |
diff --git a/test/fs/fs_var_tmp.exp b/test/fs/fs_var_tmp.exp index b8e7ea73d..8c2da085f 100755 --- a/test/fs/fs_var_tmp.exp +++ b/test/fs/fs_var_tmp.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail\r" | 11 | send -- "firejail\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 | after 100 | 16 | after 100 |
17 | send -- "stty -echo\r" | 17 | send -- "stty -echo\r" |
@@ -53,7 +53,7 @@ sleep 1 | |||
53 | send -- "firejail\r" | 53 | send -- "firejail\r" |
54 | expect { | 54 | expect { |
55 | timeout {puts "TESTING ERROR 7\n";exit} | 55 | timeout {puts "TESTING ERROR 7\n";exit} |
56 | "Child process initialized" | 56 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
57 | } | 57 | } |
58 | after 100 | 58 | after 100 |
59 | send -- "stty -echo\r" | 59 | send -- "stty -echo\r" |
diff --git a/test/fs/fscheck-tmpfs.exp b/test/fs/fscheck-tmpfs.exp index c9d237d72..223bb63ba 100755 --- a/test/fs/fscheck-tmpfs.exp +++ b/test/fs/fscheck-tmpfs.exp | |||
@@ -24,7 +24,7 @@ if { ! [file exists /tmp/fjtest-dir] } { | |||
24 | send -- "firejail --noprofile --tmpfs=~/fjtest-dir\r" | 24 | send -- "firejail --noprofile --tmpfs=~/fjtest-dir\r" |
25 | expect { | 25 | expect { |
26 | timeout {puts "TESTING ERROR 3\n";exit} | 26 | timeout {puts "TESTING ERROR 3\n";exit} |
27 | "Child process initialized" | 27 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
28 | } | 28 | } |
29 | after 500 | 29 | after 500 |
30 | 30 | ||
diff --git a/test/fs/kmsg.exp b/test/fs/kmsg.exp index acaca2cd0..e7d765bff 100755 --- a/test/fs/kmsg.exp +++ b/test/fs/kmsg.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail\r" | 10 | send -- "firejail\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/fs/macro.exp b/test/fs/macro.exp index 1d32a9cd0..c01123f41 100755 --- a/test/fs/macro.exp +++ b/test/fs/macro.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --profile=macro-whitelist.profile ls ~\r" | 11 | send -- "firejail --profile=macro-whitelist.profile ls ~\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 | expect { | 16 | expect { |
17 | timeout {puts "TESTING ERROR 1\n";exit} | 17 | timeout {puts "TESTING ERROR 1\n";exit} |
@@ -42,7 +42,7 @@ sleep 1 | |||
42 | send -- "firejail --profile=macro-blacklist.profile ls ~/Desktop\r" | 42 | send -- "firejail --profile=macro-blacklist.profile ls ~/Desktop\r" |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 7\n";exit} | 44 | timeout {puts "TESTING ERROR 7\n";exit} |
45 | "Child process initialized" | 45 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
46 | } | 46 | } |
47 | expect { | 47 | expect { |
48 | timeout {puts "TESTING ERROR 8\n";exit} | 48 | timeout {puts "TESTING ERROR 8\n";exit} |
@@ -53,7 +53,7 @@ sleep 1 | |||
53 | send -- "firejail --profile=macro-blacklist.profile ls ~/Documents\r" | 53 | send -- "firejail --profile=macro-blacklist.profile ls ~/Documents\r" |
54 | expect { | 54 | expect { |
55 | timeout {puts "TESTING ERROR 9n";exit} | 55 | timeout {puts "TESTING ERROR 9n";exit} |
56 | "Child process initialized" | 56 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
57 | } | 57 | } |
58 | expect { | 58 | expect { |
59 | timeout {puts "TESTING ERROR 10\n";exit} | 59 | timeout {puts "TESTING ERROR 10\n";exit} |
@@ -64,7 +64,7 @@ sleep 1 | |||
64 | send -- "firejail --profile=macro-blacklist.profile ls ~/Downloads\r" | 64 | send -- "firejail --profile=macro-blacklist.profile ls ~/Downloads\r" |
65 | expect { | 65 | expect { |
66 | timeout {puts "TESTING ERROR 11n";exit} | 66 | timeout {puts "TESTING ERROR 11n";exit} |
67 | "Child process initialized" | 67 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
68 | } | 68 | } |
69 | expect { | 69 | expect { |
70 | timeout {puts "TESTING ERROR 12n";exit} | 70 | timeout {puts "TESTING ERROR 12n";exit} |
@@ -75,7 +75,7 @@ sleep 1 | |||
75 | send -- "firejail --profile=macro-blacklist.profile ls ~/Music\r" | 75 | send -- "firejail --profile=macro-blacklist.profile ls ~/Music\r" |
76 | expect { | 76 | expect { |
77 | timeout {puts "TESTING ERROR 13\n";exit} | 77 | timeout {puts "TESTING ERROR 13\n";exit} |
78 | "Child process initialized" | 78 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
79 | } | 79 | } |
80 | expect { | 80 | expect { |
81 | timeout {puts "TESTING ERROR 14\n";exit} | 81 | timeout {puts "TESTING ERROR 14\n";exit} |
@@ -86,7 +86,7 @@ sleep 1 | |||
86 | send -- "firejail --profile=macro-blacklist.profile ls ~/Pictures\r" | 86 | send -- "firejail --profile=macro-blacklist.profile ls ~/Pictures\r" |
87 | expect { | 87 | expect { |
88 | timeout {puts "TESTING ERROR 15\n";exit} | 88 | timeout {puts "TESTING ERROR 15\n";exit} |
89 | "Child process initialized" | 89 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
90 | } | 90 | } |
91 | expect { | 91 | expect { |
92 | timeout {puts "TESTING ERROR 16\n";exit} | 92 | timeout {puts "TESTING ERROR 16\n";exit} |
@@ -97,7 +97,7 @@ sleep 1 | |||
97 | send -- "firejail --profile=macro-blacklist.profile ls ~/Videos\r" | 97 | send -- "firejail --profile=macro-blacklist.profile ls ~/Videos\r" |
98 | expect { | 98 | expect { |
99 | timeout {puts "TESTING ERROR 17\n";exit} | 99 | timeout {puts "TESTING ERROR 17\n";exit} |
100 | "Child process initialized" | 100 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
101 | } | 101 | } |
102 | expect { | 102 | expect { |
103 | timeout {puts "TESTING ERROR 18\n";exit} | 103 | timeout {puts "TESTING ERROR 18\n";exit} |
@@ -108,7 +108,7 @@ sleep 1 | |||
108 | send -- "firejail --profile=macro-readonly.profile touch ~/Desktop/blablabla\r" | 108 | send -- "firejail --profile=macro-readonly.profile touch ~/Desktop/blablabla\r" |
109 | expect { | 109 | expect { |
110 | timeout {puts "TESTING ERROR 19\n";exit} | 110 | timeout {puts "TESTING ERROR 19\n";exit} |
111 | "Child process initialized" | 111 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
112 | } | 112 | } |
113 | expect { | 113 | expect { |
114 | timeout {puts "TESTING ERROR 20\n";exit} | 114 | timeout {puts "TESTING ERROR 20\n";exit} |
@@ -119,7 +119,7 @@ sleep 1 | |||
119 | send -- "firejail --profile=macro-readonly.profile touch ~/Documents/blablabla\r" | 119 | send -- "firejail --profile=macro-readonly.profile touch ~/Documents/blablabla\r" |
120 | expect { | 120 | expect { |
121 | timeout {puts "TESTING ERROR 21\n";exit} | 121 | timeout {puts "TESTING ERROR 21\n";exit} |
122 | "Child process initialized" | 122 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
123 | } | 123 | } |
124 | expect { | 124 | expect { |
125 | timeout {puts "TESTING ERROR 22\n";exit} | 125 | timeout {puts "TESTING ERROR 22\n";exit} |
@@ -130,7 +130,7 @@ sleep 1 | |||
130 | send -- "firejail --profile=macro-readonly.profile touch ~/Downloads/blablabla\r" | 130 | send -- "firejail --profile=macro-readonly.profile touch ~/Downloads/blablabla\r" |
131 | expect { | 131 | expect { |
132 | timeout {puts "TESTING ERROR 23\n";exit} | 132 | timeout {puts "TESTING ERROR 23\n";exit} |
133 | "Child process initialized" | 133 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
134 | } | 134 | } |
135 | expect { | 135 | expect { |
136 | timeout {puts "TESTING ERROR 24\n";exit} | 136 | timeout {puts "TESTING ERROR 24\n";exit} |
@@ -141,7 +141,7 @@ sleep 1 | |||
141 | send -- "firejail --profile=macro-readonly.profile touch ~/Music/blablabla\r" | 141 | send -- "firejail --profile=macro-readonly.profile touch ~/Music/blablabla\r" |
142 | expect { | 142 | expect { |
143 | timeout {puts "TESTING ERROR 25\n";exit} | 143 | timeout {puts "TESTING ERROR 25\n";exit} |
144 | "Child process initialized" | 144 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
145 | } | 145 | } |
146 | expect { | 146 | expect { |
147 | timeout {puts "TESTING ERROR 26\n";exit} | 147 | timeout {puts "TESTING ERROR 26\n";exit} |
@@ -152,7 +152,7 @@ sleep 1 | |||
152 | send -- "firejail --profile=macro-readonly.profile touch ~/Pictures/blablabla\r" | 152 | send -- "firejail --profile=macro-readonly.profile touch ~/Pictures/blablabla\r" |
153 | expect { | 153 | expect { |
154 | timeout {puts "TESTING ERROR 27\n";exit} | 154 | timeout {puts "TESTING ERROR 27\n";exit} |
155 | "Child process initialized" | 155 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
156 | } | 156 | } |
157 | expect { | 157 | expect { |
158 | timeout {puts "TESTING ERROR 28\n";exit} | 158 | timeout {puts "TESTING ERROR 28\n";exit} |
@@ -163,7 +163,7 @@ sleep 1 | |||
163 | send -- "firejail --profile=macro-readonly.profile touch ~/Videos/blablabla\r" | 163 | send -- "firejail --profile=macro-readonly.profile touch ~/Videos/blablabla\r" |
164 | expect { | 164 | expect { |
165 | timeout {puts "TESTING ERROR 29\n";exit} | 165 | timeout {puts "TESTING ERROR 29\n";exit} |
166 | "Child process initialized" | 166 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
167 | } | 167 | } |
168 | expect { | 168 | expect { |
169 | timeout {puts "TESTING ERROR 30\n";exit} | 169 | timeout {puts "TESTING ERROR 30\n";exit} |
diff --git a/test/fs/mkdir_mkfile.exp b/test/fs/mkdir_mkfile.exp index 406f2c87f..c1dce58ea 100755 --- a/test/fs/mkdir_mkfile.exp +++ b/test/fs/mkdir_mkfile.exp | |||
@@ -12,7 +12,7 @@ match_max 100000 | |||
12 | send -- "firejail --private --profile=mkdir_mkfile.profile\r" | 12 | send -- "firejail --private --profile=mkdir_mkfile.profile\r" |
13 | expect { | 13 | expect { |
14 | timeout {puts "TESTING ERROR 0\n";exit} | 14 | timeout {puts "TESTING ERROR 0\n";exit} |
15 | "Child process initialized" | 15 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
16 | } | 16 | } |
17 | sleep 1 | 17 | sleep 1 |
18 | 18 | ||
diff --git a/test/fs/noblacklist-blacklist-noexec.exp b/test/fs/noblacklist-blacklist-noexec.exp index 7a3fb8263..3bc5e7c79 100755 --- a/test/fs/noblacklist-blacklist-noexec.exp +++ b/test/fs/noblacklist-blacklist-noexec.exp | |||
@@ -12,7 +12,7 @@ set PWD $env(PWD) | |||
12 | send -- "firejail --noprofile --noblacklist=$PWD --blacklist=$PWD --noexec=$PWD\r" | 12 | send -- "firejail --noprofile --noblacklist=$PWD --blacklist=$PWD --noexec=$PWD\r" |
13 | expect { | 13 | expect { |
14 | timeout {puts "TESTING ERROR 0\n";exit} | 14 | timeout {puts "TESTING ERROR 0\n";exit} |
15 | "Child process initialized" | 15 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
16 | } | 16 | } |
17 | sleep 1 | 17 | sleep 1 |
18 | 18 | ||
diff --git a/test/fs/noblacklist-blacklist-readonly.exp b/test/fs/noblacklist-blacklist-readonly.exp index d164184e7..b5d3ef045 100755 --- a/test/fs/noblacklist-blacklist-readonly.exp +++ b/test/fs/noblacklist-blacklist-readonly.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --noprofile --noblacklist=~ --blacklist=~ --read-only=~\r" | 11 | send -- "firejail --noprofile --noblacklist=~ --blacklist=~ --read-only=~\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 1 | 16 | sleep 1 |
17 | 17 | ||
diff --git a/test/fs/option_blacklist.exp b/test/fs/option_blacklist.exp index f3e1ec5a1..9e1533435 100755 --- a/test/fs/option_blacklist.exp +++ b/test/fs/option_blacklist.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --blacklist=/var\r" | 10 | send -- "firejail --blacklist=/var\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | after 100 | 15 | after 100 |
16 | send -- "stty -echo\r" | 16 | send -- "stty -echo\r" |
diff --git a/test/fs/option_blacklist_file.exp b/test/fs/option_blacklist_file.exp index 638c25f6a..93284a140 100755 --- a/test/fs/option_blacklist_file.exp +++ b/test/fs/option_blacklist_file.exp | |||
@@ -15,7 +15,7 @@ after 100 | |||
15 | send -- "firejail --blacklist=/etc/passwd --blacklist=~/_firejail_test_dir\r" | 15 | send -- "firejail --blacklist=/etc/passwd --blacklist=~/_firejail_test_dir\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 | sleep 1 | 20 | sleep 1 |
21 | 21 | ||
diff --git a/test/fs/option_blacklist_glob.exp b/test/fs/option_blacklist_glob.exp index bea08767e..83b123a4b 100755 --- a/test/fs/option_blacklist_glob.exp +++ b/test/fs/option_blacklist_glob.exp | |||
@@ -19,7 +19,7 @@ after 100 | |||
19 | send -- "firejail --blacklist=~/_firejail_test_dir/*\r" | 19 | send -- "firejail --blacklist=~/_firejail_test_dir/*\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 | send -- "cd ~/_firejail_test_dir\r" | 25 | send -- "cd ~/_firejail_test_dir\r" |
diff --git a/test/fs/private-bin.exp b/test/fs/private-bin.exp index 301141579..e4b36e114 100755 --- a/test/fs/private-bin.exp +++ b/test/fs/private-bin.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --private-bin=bash,ls,sh\r" | 10 | send -- "firejail --private-bin=bash,ls,sh\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -40,7 +40,7 @@ sleep 1 | |||
40 | send -- "firejail --profile=private-bin.profile\r" | 40 | send -- "firejail --profile=private-bin.profile\r" |
41 | expect { | 41 | expect { |
42 | timeout {puts "TESTING ERROR 7\n";exit} | 42 | timeout {puts "TESTING ERROR 7\n";exit} |
43 | "Child process initialized" | 43 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
44 | } | 44 | } |
45 | sleep 1 | 45 | sleep 1 |
46 | 46 | ||
diff --git a/test/fs/private-cache.exp b/test/fs/private-cache.exp index 4abfdcef0..f21d799b4 100755 --- a/test/fs/private-cache.exp +++ b/test/fs/private-cache.exp | |||
@@ -21,7 +21,7 @@ if { ! [file exists ~/.cache/abcdefg] } { | |||
21 | send -- "firejail --noprofile --private-cache\r" | 21 | send -- "firejail --noprofile --private-cache\r" |
22 | expect { | 22 | expect { |
23 | timeout {puts "TESTING ERROR 1\n";exit} | 23 | timeout {puts "TESTING ERROR 1\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 | ||
diff --git a/test/fs/private-etc-empty.exp b/test/fs/private-etc-empty.exp index f1ced02c7..6878a642c 100755 --- a/test/fs/private-etc-empty.exp +++ b/test/fs/private-etc-empty.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --private-etc=blablabla\r" | 10 | send -- "firejail --private-etc=blablabla\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -26,7 +26,7 @@ sleep 1 | |||
26 | send -- "firejail --profile=private-etc-empty.profile\r" | 26 | send -- "firejail --profile=private-etc-empty.profile\r" |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 0\n";exit} | 28 | timeout {puts "TESTING ERROR 0\n";exit} |
29 | "Child process initialized" | 29 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
30 | } | 30 | } |
31 | sleep 1 | 31 | sleep 1 |
32 | 32 | ||
diff --git a/test/fs/private-etc.exp b/test/fs/private-etc.exp index 2b7fcd83d..f51fc5221 100755 --- a/test/fs/private-etc.exp +++ b/test/fs/private-etc.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --private-etc=passwd,group,resolv.conf,X11\r" | 11 | send -- "firejail --private-etc=passwd,group,resolv.conf,X11\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 | sleep 1 | 16 | sleep 1 |
17 | 17 | ||
diff --git a/test/fs/private-home-dir.exp b/test/fs/private-home-dir.exp index 14eebaf8b..e46d2b113 100755 --- a/test/fs/private-home-dir.exp +++ b/test/fs/private-home-dir.exp | |||
@@ -30,7 +30,7 @@ sleep 1 | |||
30 | send -- "firejail --private=~/_firejail_test_dir1_\r" | 30 | send -- "firejail --private=~/_firejail_test_dir1_\r" |
31 | expect { | 31 | expect { |
32 | timeout {puts "TESTING ERROR 0\n";exit} | 32 | timeout {puts "TESTING ERROR 0\n";exit} |
33 | "Child process initialized" | 33 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
34 | } | 34 | } |
35 | sleep 1 | 35 | sleep 1 |
36 | 36 | ||
@@ -83,7 +83,7 @@ expect { | |||
83 | } | 83 | } |
84 | expect { | 84 | expect { |
85 | timeout {puts "TESTING ERROR 12\n";exit} | 85 | timeout {puts "TESTING ERROR 12\n";exit} |
86 | "Child process initialized" | 86 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
87 | } | 87 | } |
88 | 88 | ||
89 | sleep 1 | 89 | sleep 1 |
diff --git a/test/fs/private-home.exp b/test/fs/private-home.exp index fbe40a89b..99456a211 100755 --- a/test/fs/private-home.exp +++ b/test/fs/private-home.exp | |||
@@ -26,7 +26,7 @@ after 100 | |||
26 | send -- "firejail --private-home=_firejail_test_file1,_firejail_test_file2,_firejail_test_dir1\r" | 26 | send -- "firejail --private-home=_firejail_test_file1,_firejail_test_file2,_firejail_test_dir1\r" |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 1\n";exit} | 28 | timeout {puts "TESTING ERROR 1\n";exit} |
29 | "Child process initialized" | 29 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
30 | } | 30 | } |
31 | after 100 | 31 | after 100 |
32 | 32 | ||
@@ -86,7 +86,7 @@ after 100 | |||
86 | send -- "firejail --private-home=_firejail_test_link2\r" | 86 | send -- "firejail --private-home=_firejail_test_link2\r" |
87 | expect { | 87 | expect { |
88 | timeout {puts "TESTING ERROR 10\n";exit} | 88 | timeout {puts "TESTING ERROR 10\n";exit} |
89 | "Child process initialized" | 89 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
90 | } | 90 | } |
91 | after 100 | 91 | after 100 |
92 | send -- "file ~/_firejail_test_link2\r" | 92 | send -- "file ~/_firejail_test_link2\r" |
diff --git a/test/fs/private-homedir.exp b/test/fs/private-homedir.exp index f14d20c7b..0b4348514 100755 --- a/test/fs/private-homedir.exp +++ b/test/fs/private-homedir.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --private=~\r" | 10 | send -- "firejail --private=~\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | after 100 | 15 | after 100 |
16 | 16 | ||
diff --git a/test/fs/private-lib.exp b/test/fs/private-lib.exp index 6ad48beb7..5290def35 100755 --- a/test/fs/private-lib.exp +++ b/test/fs/private-lib.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --private-lib --private-bin=sh,bash,dash,ps,grep,ls,find,echo,stty \r" | 11 | send -- "firejail --private-lib --private-bin=sh,bash,dash,ps,grep,ls,find,echo,stty \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 | after 100 | 16 | after 100 |
17 | send -- "stty -echo\r" | 17 | send -- "stty -echo\r" |
diff --git a/test/fs/private-whitelist.exp b/test/fs/private-whitelist.exp index 1c2a13d16..48add880c 100755 --- a/test/fs/private-whitelist.exp +++ b/test/fs/private-whitelist.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --private --whitelist=/tmp/.X11-unix\r" | 10 | send -- "firejail --private --whitelist=/tmp/.X11-unix\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | after 100 | 15 | after 100 |
16 | 16 | ||
diff --git a/test/fs/private.exp b/test/fs/private.exp index d2cac6b05..ff8e0c66e 100755 --- a/test/fs/private.exp +++ b/test/fs/private.exp | |||
@@ -26,7 +26,7 @@ after 100 | |||
26 | send -- "firejail --private\r" | 26 | send -- "firejail --private\r" |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 0\n";exit} | 28 | timeout {puts "TESTING ERROR 0\n";exit} |
29 | "Child process initialized" | 29 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
30 | } | 30 | } |
31 | sleep 1 | 31 | sleep 1 |
32 | 32 | ||
diff --git a/test/fs/read-write.exp b/test/fs/read-write.exp index 138834209..f0ef0842c 100755 --- a/test/fs/read-write.exp +++ b/test/fs/read-write.exp | |||
@@ -19,7 +19,7 @@ after 100 | |||
19 | send -- "firejail --read-only=~/_firejail_test_dir --read-write=~/_firejail_test_dir/test1\r" | 19 | send -- "firejail --read-only=~/_firejail_test_dir --read-write=~/_firejail_test_dir/test1\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 | ||
diff --git a/test/fs/sys_fs.exp b/test/fs/sys_fs.exp index f501b48ca..ce1fb04de 100755 --- a/test/fs/sys_fs.exp +++ b/test/fs/sys_fs.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail\r" | 10 | send -- "firejail\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -27,7 +27,7 @@ sleep 1 | |||
27 | send -- "firejail --noblacklist=/sys/fs\r" | 27 | send -- "firejail --noblacklist=/sys/fs\r" |
28 | expect { | 28 | expect { |
29 | timeout {puts "TESTING ERROR 1\n";exit} | 29 | timeout {puts "TESTING ERROR 1\n";exit} |
30 | "Child process initialized" | 30 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
31 | } | 31 | } |
32 | sleep 1 | 32 | sleep 1 |
33 | 33 | ||
diff --git a/test/fs/whitelist-dev.exp b/test/fs/whitelist-dev.exp index 83e6bad49..7459462f8 100755 --- a/test/fs/whitelist-dev.exp +++ b/test/fs/whitelist-dev.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --whitelist=/dev/null --debug\r" | 10 | send -- "firejail --whitelist=/dev/null --debug\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -26,7 +26,7 @@ sleep 1 | |||
26 | send -- "firejail --whitelist=/dev/null --whitelist=/dev/random\r" | 26 | send -- "firejail --whitelist=/dev/null --whitelist=/dev/random\r" |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 2\n";exit} | 28 | timeout {puts "TESTING ERROR 2\n";exit} |
29 | "Child process initialized" | 29 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
30 | } | 30 | } |
31 | sleep 1 | 31 | sleep 1 |
32 | 32 | ||
@@ -42,7 +42,7 @@ sleep 1 | |||
42 | send -- "firejail --private-dev --debug\r" | 42 | send -- "firejail --private-dev --debug\r" |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 4\n";exit} | 44 | timeout {puts "TESTING ERROR 4\n";exit} |
45 | "Child process initialized" | 45 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
46 | } | 46 | } |
47 | sleep 1 | 47 | sleep 1 |
48 | 48 | ||
@@ -97,7 +97,7 @@ if { $have_snd > 0 } { | |||
97 | send -- "firejail --private-dev --nosound ls /dev\r" | 97 | send -- "firejail --private-dev --nosound ls /dev\r" |
98 | expect { | 98 | expect { |
99 | timeout {puts "TESTING ERROR 7\n";exit} | 99 | timeout {puts "TESTING ERROR 7\n";exit} |
100 | "Child process initialized" | 100 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
101 | } | 101 | } |
102 | expect { | 102 | expect { |
103 | timeout {puts "TESTING ERROR 8\n";exit} | 103 | timeout {puts "TESTING ERROR 8\n";exit} |
@@ -114,7 +114,7 @@ if { $have_dvd > 0 } { | |||
114 | send -- "firejail --private-dev --nodvd ls /dev\r" | 114 | send -- "firejail --private-dev --nodvd ls /dev\r" |
115 | expect { | 115 | expect { |
116 | timeout {puts "TESTING ERROR 10\n";exit} | 116 | timeout {puts "TESTING ERROR 10\n";exit} |
117 | "Child process initialized" | 117 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
118 | } | 118 | } |
119 | expect { | 119 | expect { |
120 | timeout {puts "TESTING ERROR 11\n";exit} | 120 | timeout {puts "TESTING ERROR 11\n";exit} |
@@ -135,7 +135,7 @@ if { $have_dri > 0 } { | |||
135 | send -- "firejail --private-dev --no3d ls /dev\r" | 135 | send -- "firejail --private-dev --no3d ls /dev\r" |
136 | expect { | 136 | expect { |
137 | timeout {puts "TESTING ERROR 17\n";exit} | 137 | timeout {puts "TESTING ERROR 17\n";exit} |
138 | "Child process initialized" | 138 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
139 | } | 139 | } |
140 | expect { | 140 | expect { |
141 | timeout {puts "TESTING ERROR 18\n";exit} | 141 | timeout {puts "TESTING ERROR 18\n";exit} |
diff --git a/test/fs/whitelist-double.exp b/test/fs/whitelist-double.exp index f9eeee038..b3b48f2cd 100755 --- a/test/fs/whitelist-double.exp +++ b/test/fs/whitelist-double.exp | |||
@@ -13,7 +13,7 @@ sleep 1 | |||
13 | send -- "firejail --whitelist=/tmp/_firejail_test_file --whitelist=/tmp/_firejail_test_file\r" | 13 | send -- "firejail --whitelist=/tmp/_firejail_test_file --whitelist=/tmp/_firejail_test_file\r" |
14 | expect { | 14 | expect { |
15 | timeout {puts "TESTING ERROR 0\n";exit} | 15 | timeout {puts "TESTING ERROR 0\n";exit} |
16 | "Child process initialized" | 16 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
17 | } | 17 | } |
18 | sleep 1 | 18 | sleep 1 |
19 | 19 | ||
diff --git a/test/fs/whitelist-empty.exp b/test/fs/whitelist-empty.exp index cd72b3ef9..18d4561d6 100755 --- a/test/fs/whitelist-empty.exp +++ b/test/fs/whitelist-empty.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --whitelist=~/blablabla --whitelist=/tmp/blablabla --whitelist=/media/blablabla --whitelist=/var/blablabla --whitelist=/dev/blablabla --whitelist=/opt/blablabla\r" | 10 | send -- "firejail --whitelist=~/blablabla --whitelist=/tmp/blablabla --whitelist=/media/blablabla --whitelist=/var/blablabla --whitelist=/dev/blablabla --whitelist=/opt/blablabla\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/fs/whitelist-noexec.exp b/test/fs/whitelist-noexec.exp index d997aba72..ba3ca4d92 100755 --- a/test/fs/whitelist-noexec.exp +++ b/test/fs/whitelist-noexec.exp | |||
@@ -12,7 +12,7 @@ set PWD $env(PWD) | |||
12 | send -- "firejail --noprofile --whitelist=$PWD --noexec=$PWD\r" | 12 | send -- "firejail --noprofile --whitelist=$PWD --noexec=$PWD\r" |
13 | expect { | 13 | expect { |
14 | timeout {puts "TESTING ERROR 0\n";exit} | 14 | timeout {puts "TESTING ERROR 0\n";exit} |
15 | "Child process initialized" | 15 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
16 | } | 16 | } |
17 | sleep 1 | 17 | sleep 1 |
18 | 18 | ||
diff --git a/test/fs/whitelist-readonly.exp b/test/fs/whitelist-readonly.exp index 4c29c746b..676131ade 100755 --- a/test/fs/whitelist-readonly.exp +++ b/test/fs/whitelist-readonly.exp | |||
@@ -19,7 +19,7 @@ after 100 | |||
19 | send -- "firejail --noprofile --whitelist=~/_firejail_test_dir --read-only=~\r" | 19 | send -- "firejail --noprofile --whitelist=~/_firejail_test_dir --read-only=~\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 | ||
diff --git a/test/fs/whitelist-whitespace.exp b/test/fs/whitelist-whitespace.exp index 66a4f8549..885b90f2a 100755 --- a/test/fs/whitelist-whitespace.exp +++ b/test/fs/whitelist-whitespace.exp | |||
@@ -13,7 +13,7 @@ after 100 | |||
13 | send -- "firejail --noprofile --whitelist=~/filewith\\\ \\\ many\\\ whitespaces\\\ \r" | 13 | send -- "firejail --noprofile --whitelist=~/filewith\\\ \\\ many\\\ whitespaces\\\ \r" |
14 | expect { | 14 | expect { |
15 | timeout {puts "TESTING ERROR 1\n";exit} | 15 | timeout {puts "TESTING ERROR 1\n";exit} |
16 | "Child process initialized" | 16 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
17 | } | 17 | } |
18 | sleep 1 | 18 | sleep 1 |
19 | 19 | ||
diff --git a/test/fs/whitelist.exp b/test/fs/whitelist.exp index 2a970ca37..8e98b9dfa 100755 --- a/test/fs/whitelist.exp +++ b/test/fs/whitelist.exp | |||
@@ -36,7 +36,7 @@ after 200 | |||
36 | send -- "firejail --whitelist=~/fjtest-file --whitelist=~/fjtest-dir --debug\r" | 36 | send -- "firejail --whitelist=~/fjtest-file --whitelist=~/fjtest-dir --debug\r" |
37 | expect { | 37 | expect { |
38 | timeout {puts "TESTING ERROR 0\n";exit} | 38 | timeout {puts "TESTING ERROR 0\n";exit} |
39 | "Child process initialized" | 39 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
40 | } | 40 | } |
41 | sleep 1 | 41 | sleep 1 |
42 | 42 | ||
@@ -73,7 +73,7 @@ sleep 1 | |||
73 | send -- "firejail --whitelist=~/fjtest-dir/fjtest-dir/fjtest-file\r" | 73 | send -- "firejail --whitelist=~/fjtest-dir/fjtest-dir/fjtest-file\r" |
74 | expect { | 74 | expect { |
75 | timeout {puts "TESTING ERROR 10\n";exit} | 75 | timeout {puts "TESTING ERROR 10\n";exit} |
76 | "Child process initialized" | 76 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
77 | } | 77 | } |
78 | sleep 1 | 78 | sleep 1 |
79 | 79 | ||
@@ -98,7 +98,7 @@ sleep 1 | |||
98 | send -- "firejail --whitelist=~/fjtest-file-lnk --whitelist=~/fjtest-dir-lnk\r" | 98 | send -- "firejail --whitelist=~/fjtest-file-lnk --whitelist=~/fjtest-dir-lnk\r" |
99 | expect { | 99 | expect { |
100 | timeout {puts "TESTING ERROR 20\n";exit} | 100 | timeout {puts "TESTING ERROR 20\n";exit} |
101 | "Child process initialized" | 101 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
102 | } | 102 | } |
103 | sleep 1 | 103 | sleep 1 |
104 | 104 | ||
diff --git a/test/network/4bridges_arp.exp b/test/network/4bridges_arp.exp index ccf6050fc..b7138851a 100755 --- a/test/network/4bridges_arp.exp +++ b/test/network/4bridges_arp.exp | |||
@@ -27,7 +27,7 @@ expect { | |||
27 | } | 27 | } |
28 | expect { | 28 | expect { |
29 | timeout {puts "TESTING ERROR 0.4\n";exit} | 29 | timeout {puts "TESTING ERROR 0.4\n";exit} |
30 | "Child process initialized" | 30 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
31 | } | 31 | } |
32 | sleep 1 | 32 | sleep 1 |
33 | send -- "exit\r" | 33 | send -- "exit\r" |
@@ -53,7 +53,7 @@ expect { | |||
53 | } | 53 | } |
54 | expect { | 54 | expect { |
55 | timeout {puts "TESTING ERROR 1.4\n";exit} | 55 | timeout {puts "TESTING ERROR 1.4\n";exit} |
56 | "Child process initialized" | 56 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
57 | } | 57 | } |
58 | sleep 1 | 58 | sleep 1 |
59 | send -- "exit\r" | 59 | send -- "exit\r" |
@@ -80,7 +80,7 @@ expect { | |||
80 | } | 80 | } |
81 | expect { | 81 | expect { |
82 | timeout {puts "TESTING ERROR 2.4\n";exit} | 82 | timeout {puts "TESTING ERROR 2.4\n";exit} |
83 | "Child process initialized" | 83 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
84 | } | 84 | } |
85 | sleep 1 | 85 | sleep 1 |
86 | send -- "exit\r" | 86 | send -- "exit\r" |
@@ -108,7 +108,7 @@ expect { | |||
108 | } | 108 | } |
109 | expect { | 109 | expect { |
110 | timeout {puts "TESTING ERROR 4\n";exit} | 110 | timeout {puts "TESTING ERROR 4\n";exit} |
111 | "Child process initialized" | 111 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
112 | } | 112 | } |
113 | sleep 1 | 113 | sleep 1 |
114 | send -- "exit\r" | 114 | send -- "exit\r" |
@@ -137,7 +137,7 @@ expect { | |||
137 | } | 137 | } |
138 | expect { | 138 | expect { |
139 | timeout {puts "TESTING ERROR 9\n";exit} | 139 | timeout {puts "TESTING ERROR 9\n";exit} |
140 | "Child process initialized" | 140 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
141 | } | 141 | } |
142 | sleep 1 | 142 | sleep 1 |
143 | 143 | ||
diff --git a/test/network/4bridges_ip.exp b/test/network/4bridges_ip.exp index af47391ef..60e9d3bab 100755 --- a/test/network/4bridges_ip.exp +++ b/test/network/4bridges_ip.exp | |||
@@ -27,7 +27,7 @@ expect { | |||
27 | } | 27 | } |
28 | expect { | 28 | expect { |
29 | timeout {puts "TESTING ERROR 0.4\n";exit} | 29 | timeout {puts "TESTING ERROR 0.4\n";exit} |
30 | "Child process initialized" | 30 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
31 | } | 31 | } |
32 | sleep 1 | 32 | sleep 1 |
33 | send -- "exit\r" | 33 | send -- "exit\r" |
@@ -53,7 +53,7 @@ expect { | |||
53 | } | 53 | } |
54 | expect { | 54 | expect { |
55 | timeout {puts "TESTING ERROR 1.4\n";exit} | 55 | timeout {puts "TESTING ERROR 1.4\n";exit} |
56 | "Child process initialized" | 56 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
57 | } | 57 | } |
58 | sleep 1 | 58 | sleep 1 |
59 | send -- "exit\r" | 59 | send -- "exit\r" |
@@ -80,7 +80,7 @@ expect { | |||
80 | } | 80 | } |
81 | expect { | 81 | expect { |
82 | timeout {puts "TESTING ERROR 2.4\n";exit} | 82 | timeout {puts "TESTING ERROR 2.4\n";exit} |
83 | "Child process initialized" | 83 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
84 | } | 84 | } |
85 | sleep 1 | 85 | sleep 1 |
86 | send -- "exit\r" | 86 | send -- "exit\r" |
@@ -108,7 +108,7 @@ expect { | |||
108 | } | 108 | } |
109 | expect { | 109 | expect { |
110 | timeout {puts "TESTING ERROR 4\n";exit} | 110 | timeout {puts "TESTING ERROR 4\n";exit} |
111 | "Child process initialized" | 111 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
112 | } | 112 | } |
113 | sleep 1 | 113 | sleep 1 |
114 | send -- "exit\r" | 114 | send -- "exit\r" |
@@ -137,7 +137,7 @@ expect { | |||
137 | } | 137 | } |
138 | expect { | 138 | expect { |
139 | timeout {puts "TESTING ERROR 9\n";exit} | 139 | timeout {puts "TESTING ERROR 9\n";exit} |
140 | "Child process initialized" | 140 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
141 | } | 141 | } |
142 | 142 | ||
143 | # check default gateway | 143 | # check default gateway |
diff --git a/test/network/bandwidth.exp b/test/network/bandwidth.exp index 6b85aa07f..1a27bc0bf 100755 --- a/test/network/bandwidth.exp +++ b/test/network/bandwidth.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=test --net=br0\r" | 10 | send -- "firejail --name=test --net=br0\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/network/dns-print.exp b/test/network/dns-print.exp index 760e9c252..fd19b79ed 100755 --- a/test/network/dns-print.exp +++ b/test/network/dns-print.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=test-dns --net=eth0 --dns=1.2.3.4 --dns=2.3.4.5 --dns=3.4.5.6\r" | 10 | send -- "firejail --name=test-dns --net=eth0 --dns=1.2.3.4 --dns=2.3.4.5 --dns=3.4.5.6\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/network/firemon-arp.exp b/test/network/firemon-arp.exp index 5caa4e8bd..0e98b9f36 100755 --- a/test/network/firemon-arp.exp +++ b/test/network/firemon-arp.exp | |||
@@ -17,7 +17,7 @@ match_max 100000 | |||
17 | send -- "firejail --name=test1\r" | 17 | send -- "firejail --name=test1\r" |
18 | expect { | 18 | expect { |
19 | timeout {puts "TESTING ERROR 1\n";exit} | 19 | timeout {puts "TESTING ERROR 1\n";exit} |
20 | "Child process initialized" | 20 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
21 | } | 21 | } |
22 | sleep 1 | 22 | sleep 1 |
23 | 23 | ||
@@ -25,7 +25,7 @@ spawn $env(SHELL) | |||
25 | send -- "firejail --name=test2\r" | 25 | send -- "firejail --name=test2\r" |
26 | expect { | 26 | expect { |
27 | timeout {puts "TESTING ERROR 2\n";exit} | 27 | timeout {puts "TESTING ERROR 2\n";exit} |
28 | "Child process initialized" | 28 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
29 | } | 29 | } |
30 | sleep 1 | 30 | sleep 1 |
31 | 31 | ||
diff --git a/test/network/firemon-interfaces.exp b/test/network/firemon-interfaces.exp index f49e4c470..8eb9f4d87 100755 --- a/test/network/firemon-interfaces.exp +++ b/test/network/firemon-interfaces.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --net=eth0 --name=test1\r" | 10 | send -- "firejail --net=eth0 --name=test1\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 9\n";exit} | 12 | timeout {puts "TESTING ERROR 9\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -18,7 +18,7 @@ spawn $env(SHELL) | |||
18 | send -- "firejail --net=eth0 --name=test2\r" | 18 | send -- "firejail --net=eth0 --name=test2\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 9\n";exit} | 20 | timeout {puts "TESTING ERROR 9\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 | ||
diff --git a/test/network/firemon-route.exp b/test/network/firemon-route.exp index a3af6b2c6..4eea5c14c 100755 --- a/test/network/firemon-route.exp +++ b/test/network/firemon-route.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=test1\r" | 10 | send -- "firejail --name=test1\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -18,7 +18,7 @@ spawn $env(SHELL) | |||
18 | send -- "firejail --name=test2\r" | 18 | send -- "firejail --name=test2\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 1\n";exit} | 20 | timeout {puts "TESTING ERROR 1\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 | ||
diff --git a/test/network/hostname.exp b/test/network/hostname.exp index 3fe684a75..12266a170 100755 --- a/test/network/hostname.exp +++ b/test/network/hostname.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --hostname=bingo --noprofile\r" | 10 | send -- "firejail --hostname=bingo --noprofile\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | send -- "stty -echo\r" | 16 | send -- "stty -echo\r" |
diff --git a/test/network/interface.exp b/test/network/interface.exp index 4ae5b1da6..7c3e39fea 100755 --- a/test/network/interface.exp +++ b/test/network/interface.exp | |||
@@ -20,7 +20,7 @@ set chroot [lindex $argv 1] | |||
20 | send -- "firejail --noprofile --interface=eth0.5 --interface=eth0.6\r" | 20 | send -- "firejail --noprofile --interface=eth0.5 --interface=eth0.6\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 | ||
diff --git a/test/network/ip6.exp b/test/network/ip6.exp index ddc50754f..665081db7 100755 --- a/test/network/ip6.exp +++ b/test/network/ip6.exp | |||
@@ -23,7 +23,7 @@ expect { | |||
23 | } | 23 | } |
24 | expect { | 24 | expect { |
25 | timeout {puts "TESTING ERROR 3\n";exit} | 25 | timeout {puts "TESTING ERROR 3\n";exit} |
26 | "Child process initialized" | 26 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
27 | } | 27 | } |
28 | sleep 2 | 28 | sleep 2 |
29 | 29 | ||
@@ -64,7 +64,7 @@ expect { | |||
64 | } | 64 | } |
65 | expect { | 65 | expect { |
66 | timeout {puts "TESTING ERROR 13\n";exit} | 66 | timeout {puts "TESTING ERROR 13\n";exit} |
67 | "Child process initialized" | 67 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
68 | } | 68 | } |
69 | sleep 2 | 69 | sleep 2 |
70 | 70 | ||
@@ -90,7 +90,7 @@ send -- "firejail --debug --netfilter6=ipv6.net\r" | |||
90 | expect { | 90 | expect { |
91 | timeout {puts "TESTING ERROR 11\n";exit} | 91 | timeout {puts "TESTING ERROR 11\n";exit} |
92 | "Installing IPv6 firewall" {puts "TESTING ERROR 12\n";exit} | 92 | "Installing IPv6 firewall" {puts "TESTING ERROR 12\n";exit} |
93 | "Child process initialized" | 93 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
94 | } | 94 | } |
95 | after 100 | 95 | after 100 |
96 | send -- "exit\r" | 96 | send -- "exit\r" |
diff --git a/test/network/iprange.exp b/test/network/iprange.exp index cfb1f25c7..d45ecaa40 100755 --- a/test/network/iprange.exp +++ b/test/network/iprange.exp | |||
@@ -27,7 +27,7 @@ expect { | |||
27 | } | 27 | } |
28 | expect { | 28 | expect { |
29 | timeout {puts "TESTING ERROR 3\n";exit} | 29 | timeout {puts "TESTING ERROR 3\n";exit} |
30 | "Child process initialized" | 30 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
31 | } | 31 | } |
32 | after 100 | 32 | after 100 |
33 | send -- "exit\r" | 33 | send -- "exit\r" |
@@ -53,7 +53,7 @@ expect { | |||
53 | } | 53 | } |
54 | expect { | 54 | expect { |
55 | timeout {puts "TESTING ERROR 8\n";exit} | 55 | timeout {puts "TESTING ERROR 8\n";exit} |
56 | "Child process initialized" | 56 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
57 | } | 57 | } |
58 | after 100 | 58 | after 100 |
59 | send -- "exit\r" | 59 | send -- "exit\r" |
diff --git a/test/network/net_arp.exp b/test/network/net_arp.exp index 4c4e893b1..dee4ac1c1 100755 --- a/test/network/net_arp.exp +++ b/test/network/net_arp.exp | |||
@@ -10,27 +10,27 @@ match_max 100000 | |||
10 | send -- "firejail --net=br0 sleep 20 &\r" | 10 | send -- "firejail --net=br0 sleep 20 &\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | send -- "firejail --net=br0 sleep 20 &\r" | 15 | send -- "firejail --net=br0 sleep 20 &\r" |
16 | expect { | 16 | expect { |
17 | timeout {puts "TESTING ERROR 1\n";exit} | 17 | timeout {puts "TESTING ERROR 1\n";exit} |
18 | "Child process initialized" | 18 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
19 | } | 19 | } |
20 | send -- "firejail --net=br0 sleep 20 &\r" | 20 | send -- "firejail --net=br0 sleep 20 &\r" |
21 | expect { | 21 | expect { |
22 | timeout {puts "TESTING ERROR 2\n";exit} | 22 | timeout {puts "TESTING ERROR 2\n";exit} |
23 | "Child process initialized" | 23 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
24 | } | 24 | } |
25 | send -- "firejail --net=br0 sleep 20 &\r" | 25 | send -- "firejail --net=br0 sleep 20 &\r" |
26 | expect { | 26 | expect { |
27 | timeout {puts "TESTING ERROR 3\n";exit} | 27 | timeout {puts "TESTING ERROR 3\n";exit} |
28 | "Child process initialized" | 28 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
29 | } | 29 | } |
30 | send -- "firejail --net=br0 sleep 20 &\r" | 30 | send -- "firejail --net=br0 sleep 20 &\r" |
31 | expect { | 31 | expect { |
32 | timeout {puts "TESTING ERROR 4\n";exit} | 32 | timeout {puts "TESTING ERROR 4\n";exit} |
33 | "Child process initialized" | 33 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
34 | } | 34 | } |
35 | 35 | ||
36 | # will fail | 36 | # will fail |
diff --git a/test/network/net_defaultgw.exp b/test/network/net_defaultgw.exp index e154daccf..6a5a0b64e 100755 --- a/test/network/net_defaultgw.exp +++ b/test/network/net_defaultgw.exp | |||
@@ -27,7 +27,7 @@ expect { | |||
27 | } | 27 | } |
28 | expect { | 28 | expect { |
29 | timeout {puts "TESTING ERROR 4\n";exit} | 29 | timeout {puts "TESTING ERROR 4\n";exit} |
30 | "Child process initialized" | 30 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
31 | } | 31 | } |
32 | sleep 1 | 32 | sleep 1 |
33 | 33 | ||
diff --git a/test/network/net_defaultgw2.exp b/test/network/net_defaultgw2.exp index c32549d63..5d18571b6 100755 --- a/test/network/net_defaultgw2.exp +++ b/test/network/net_defaultgw2.exp | |||
@@ -15,7 +15,7 @@ expect { | |||
15 | } | 15 | } |
16 | expect { | 16 | expect { |
17 | timeout {puts "TESTING ERROR 4\n";exit} | 17 | timeout {puts "TESTING ERROR 4\n";exit} |
18 | "Child process initialized" | 18 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
19 | } | 19 | } |
20 | sleep 1 | 20 | sleep 1 |
21 | 21 | ||
diff --git a/test/network/net_ip.exp b/test/network/net_ip.exp index 604791f69..bdac67155 100755 --- a/test/network/net_ip.exp +++ b/test/network/net_ip.exp | |||
@@ -27,7 +27,7 @@ expect { | |||
27 | } | 27 | } |
28 | expect { | 28 | expect { |
29 | timeout {puts "TESTING ERROR 4\n";exit} | 29 | timeout {puts "TESTING ERROR 4\n";exit} |
30 | "Child process initialized" | 30 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
31 | } | 31 | } |
32 | sleep 1 | 32 | sleep 1 |
33 | send -- "exit\r" | 33 | send -- "exit\r" |
@@ -53,7 +53,7 @@ expect { | |||
53 | } | 53 | } |
54 | expect { | 54 | expect { |
55 | timeout {puts "TESTING ERROR 9\n";exit} | 55 | timeout {puts "TESTING ERROR 9\n";exit} |
56 | "Child process initialized" | 56 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
57 | } | 57 | } |
58 | sleep 1 | 58 | sleep 1 |
59 | 59 | ||
diff --git a/test/network/net_local.exp b/test/network/net_local.exp index 54e821a90..6d02de089 100755 --- a/test/network/net_local.exp +++ b/test/network/net_local.exp | |||
@@ -15,7 +15,7 @@ expect { | |||
15 | } | 15 | } |
16 | expect { | 16 | expect { |
17 | timeout {puts "TESTING ERROR 4\n";exit} | 17 | timeout {puts "TESTING ERROR 4\n";exit} |
18 | "Child process initialized" | 18 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
19 | } | 19 | } |
20 | sleep 1 | 20 | sleep 1 |
21 | send -- "exit\r" | 21 | send -- "exit\r" |
@@ -25,7 +25,7 @@ sleep 1 | |||
25 | send -- "firejail --noprofile\r" | 25 | send -- "firejail --noprofile\r" |
26 | expect { | 26 | expect { |
27 | timeout {puts "TESTING ERROR 9\n";exit} | 27 | timeout {puts "TESTING ERROR 9\n";exit} |
28 | "Child process initialized" | 28 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
29 | } | 29 | } |
30 | sleep 1 | 30 | sleep 1 |
31 | 31 | ||
diff --git a/test/network/net_mac.exp b/test/network/net_mac.exp index 05400a761..3bd871a06 100755 --- a/test/network/net_mac.exp +++ b/test/network/net_mac.exp | |||
@@ -31,7 +31,7 @@ expect { | |||
31 | } | 31 | } |
32 | expect { | 32 | expect { |
33 | timeout {puts "TESTING ERROR 4\n";exit} | 33 | timeout {puts "TESTING ERROR 4\n";exit} |
34 | "Child process initialized" | 34 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
35 | } | 35 | } |
36 | send -- "exit\r" | 36 | send -- "exit\r" |
37 | after 100 | 37 | after 100 |
diff --git a/test/network/net_macvlan2.exp b/test/network/net_macvlan2.exp index 9be0a8580..abc6641bf 100755 --- a/test/network/net_macvlan2.exp +++ b/test/network/net_macvlan2.exp | |||
@@ -30,7 +30,7 @@ expect { | |||
30 | } | 30 | } |
31 | expect { | 31 | expect { |
32 | timeout {puts "TESTING ERROR 0.6\n";exit} | 32 | timeout {puts "TESTING ERROR 0.6\n";exit} |
33 | "Child process initialized" | 33 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
34 | } | 34 | } |
35 | after 100 | 35 | after 100 |
36 | send -- "exit\r" | 36 | send -- "exit\r" |
diff --git a/test/network/net_mtu.exp b/test/network/net_mtu.exp index 254207a4e..81c89e147 100755 --- a/test/network/net_mtu.exp +++ b/test/network/net_mtu.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --net=br0 --mtu=1000 --noprofile\r" | 11 | send -- "firejail --net=br0 --mtu=1000 --noprofile\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 | sleep 1 | 16 | sleep 1 |
17 | 17 | ||
diff --git a/test/network/net_netfilter.exp b/test/network/net_netfilter.exp index 65865122a..eef4a145f 100755 --- a/test/network/net_netfilter.exp +++ b/test/network/net_netfilter.exp | |||
@@ -27,7 +27,7 @@ expect { | |||
27 | } | 27 | } |
28 | expect { | 28 | expect { |
29 | timeout {puts "TESTING ERROR 4\n";exit} | 29 | timeout {puts "TESTING ERROR 4\n";exit} |
30 | "Child process initialized" | 30 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
31 | } | 31 | } |
32 | sleep 1 | 32 | sleep 1 |
33 | send -- "exit\r" | 33 | send -- "exit\r" |
@@ -41,7 +41,7 @@ expect { | |||
41 | "Chain INPUT (policy DROP" {puts "TESTING ERROR 5.1\n";exit} | 41 | "Chain INPUT (policy DROP" {puts "TESTING ERROR 5.1\n";exit} |
42 | "ACCEPT all -- any any anywhere" {puts "TESTING ERROR 5.1\n";exit} | 42 | "ACCEPT all -- any any anywhere" {puts "TESTING ERROR 5.1\n";exit} |
43 | "ACCEPT icmp -- any any anywhere" {puts "TESTING ERROR 5.1\n";exit} | 43 | "ACCEPT icmp -- any any anywhere" {puts "TESTING ERROR 5.1\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 1 | 46 | sleep 1 |
47 | send -- "exit\r" | 47 | send -- "exit\r" |
@@ -55,7 +55,7 @@ expect { | |||
55 | } | 55 | } |
56 | expect { | 56 | expect { |
57 | timeout {puts "TESTING ERROR 6.1\n";exit} | 57 | timeout {puts "TESTING ERROR 6.1\n";exit} |
58 | "Child process initialized" | 58 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
59 | } | 59 | } |
60 | sleep 1 | 60 | sleep 1 |
61 | send -- "ping -c 1 -w 3 10.10.20.1\r" | 61 | send -- "ping -c 1 -w 3 10.10.20.1\r" |
@@ -75,7 +75,7 @@ expect { | |||
75 | } | 75 | } |
76 | expect { | 76 | expect { |
77 | timeout {puts "TESTING ERROR 7.1\n";exit} | 77 | timeout {puts "TESTING ERROR 7.1\n";exit} |
78 | "Child process initialized" | 78 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
79 | } | 79 | } |
80 | sleep 2 | 80 | sleep 2 |
81 | send -- "ping -c 1 -w 3 10.10.20.1\r" | 81 | send -- "ping -c 1 -w 3 10.10.20.1\r" |
diff --git a/test/network/net_noip.exp b/test/network/net_noip.exp index 37211d923..11d12c3d3 100755 --- a/test/network/net_noip.exp +++ b/test/network/net_noip.exp | |||
@@ -12,7 +12,7 @@ send -- "firejail --noprofile --net=br0 --ip=none\r" | |||
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
14 | "eth0" {puts "TESTING ERROR 1\n";exit} | 14 | "eth0" {puts "TESTING ERROR 1\n";exit} |
15 | "Child process initialized" | 15 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
16 | } | 16 | } |
17 | sleep 1 | 17 | sleep 1 |
18 | send -- "bash\r" | 18 | send -- "bash\r" |
diff --git a/test/network/net_noip2.exp b/test/network/net_noip2.exp index ebba23e81..09607d4b5 100755 --- a/test/network/net_noip2.exp +++ b/test/network/net_noip2.exp | |||
@@ -12,7 +12,7 @@ send -- "firejail --noprofile --net=br1 --ip=none --defaultgw=10.10.30.78\r" | |||
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
14 | "eth0" {puts "TESTING ERROR 1\n";exit} | 14 | "eth0" {puts "TESTING ERROR 1\n";exit} |
15 | "Child process initialized" | 15 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
16 | } | 16 | } |
17 | sleep 1 | 17 | sleep 1 |
18 | send -- "bash\r" | 18 | send -- "bash\r" |
diff --git a/test/network/net_none.exp b/test/network/net_none.exp index 95b1cf086..32d7532ce 100755 --- a/test/network/net_none.exp +++ b/test/network/net_none.exp | |||
@@ -12,7 +12,7 @@ send -- "firejail --net=none\r" | |||
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
14 | "eth0" {puts "TESTING ERROR 0.1\n";exit} | 14 | "eth0" {puts "TESTING ERROR 0.1\n";exit} |
15 | "Child process initialized" | 15 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
16 | } | 16 | } |
17 | sleep 1 | 17 | sleep 1 |
18 | 18 | ||
@@ -47,7 +47,7 @@ send -- "firejail --profile=net_none.profile\r" | |||
47 | expect { | 47 | expect { |
48 | timeout {puts "TESTING ERROR 3\n";exit} | 48 | timeout {puts "TESTING ERROR 3\n";exit} |
49 | "eth0" {puts "TESTING ERROR 3.1\n";exit} | 49 | "eth0" {puts "TESTING ERROR 3.1\n";exit} |
50 | "Child process initialized" | 50 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
51 | } | 51 | } |
52 | sleep 1 | 52 | sleep 1 |
53 | 53 | ||
diff --git a/test/network/net_profile.exp b/test/network/net_profile.exp index 236603ff1..3d6f8fdbb 100755 --- a/test/network/net_profile.exp +++ b/test/network/net_profile.exp | |||
@@ -31,7 +31,7 @@ expect { | |||
31 | } | 31 | } |
32 | expect { | 32 | expect { |
33 | timeout {puts "TESTING ERROR 0.4\n";exit} | 33 | timeout {puts "TESTING ERROR 0.4\n";exit} |
34 | "Child process initialized" | 34 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
35 | } | 35 | } |
36 | sleep 1 | 36 | sleep 1 |
37 | 37 | ||
diff --git a/test/network/net_scan.exp b/test/network/net_scan.exp index 90e2e6b9d..42dd74df0 100755 --- a/test/network/net_scan.exp +++ b/test/network/net_scan.exp | |||
@@ -23,7 +23,7 @@ expect { | |||
23 | } | 23 | } |
24 | expect { | 24 | expect { |
25 | timeout {puts "TESTING ERROR 3\n";exit} | 25 | timeout {puts "TESTING ERROR 3\n";exit} |
26 | "Child process initialized" | 26 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
27 | } | 27 | } |
28 | sleep 1 | 28 | sleep 1 |
29 | 29 | ||
@@ -43,7 +43,7 @@ expect { | |||
43 | } | 43 | } |
44 | expect { | 44 | expect { |
45 | timeout {puts "TESTING ERROR 7\n";exit} | 45 | timeout {puts "TESTING ERROR 7\n";exit} |
46 | "Child process initialized" | 46 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
47 | } | 47 | } |
48 | sleep 1 | 48 | sleep 1 |
49 | 49 | ||
@@ -63,7 +63,7 @@ expect { | |||
63 | } | 63 | } |
64 | expect { | 64 | expect { |
65 | timeout {puts "TESTING ERROR 11\n";exit} | 65 | timeout {puts "TESTING ERROR 11\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/network/net_unconfigured.exp b/test/network/net_unconfigured.exp index 434edaea3..92d7a33eb 100755 --- a/test/network/net_unconfigured.exp +++ b/test/network/net_unconfigured.exp | |||
@@ -12,7 +12,7 @@ send -- "firejail --noprofile --net=br-unconfigured --ip=none\r" | |||
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
14 | "eth0" {puts "TESTING ERROR 1\n";exit} | 14 | "eth0" {puts "TESTING ERROR 1\n";exit} |
15 | "Child process initialized" | 15 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
16 | } | 16 | } |
17 | sleep 1 | 17 | sleep 1 |
18 | send -- "bash\r" | 18 | send -- "bash\r" |
@@ -53,7 +53,7 @@ send -- "firejail --noprofile --net=br-unconfigured\r" | |||
53 | expect { | 53 | expect { |
54 | timeout {puts "TESTING ERROR 7\n";exit} | 54 | timeout {puts "TESTING ERROR 7\n";exit} |
55 | "eth0" {puts "TESTING ERROR 8\n";exit} | 55 | "eth0" {puts "TESTING ERROR 8\n";exit} |
56 | "Child process initialized" | 56 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
57 | } | 57 | } |
58 | sleep 1 | 58 | sleep 1 |
59 | send -- "bash\r" | 59 | send -- "bash\r" |
@@ -93,7 +93,7 @@ send -- "firejail --noprofile --net=br-unconfigured --defaultgw=10.10.80.1\r" | |||
93 | expect { | 93 | expect { |
94 | timeout {puts "TESTING ERROR 14\n";exit} | 94 | timeout {puts "TESTING ERROR 14\n";exit} |
95 | "eth0" {puts "TESTING ERROR 15\n";exit} | 95 | "eth0" {puts "TESTING ERROR 15\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 | send -- "bash\r" | 99 | send -- "bash\r" |
@@ -133,7 +133,7 @@ send -- "firejail --noprofile --net=br-unconfigured --ip=10.10.80.1 --defaultgw= | |||
133 | expect { | 133 | expect { |
134 | timeout {puts "TESTING ERROR 21\n";exit} | 134 | timeout {puts "TESTING ERROR 21\n";exit} |
135 | "eth0" {puts "TESTING ERROR 22\n";exit} | 135 | "eth0" {puts "TESTING ERROR 22\n";exit} |
136 | "Child process initialized" | 136 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
137 | } | 137 | } |
138 | sleep 1 | 138 | sleep 1 |
139 | send -- "bash\r" | 139 | send -- "bash\r" |
@@ -180,7 +180,7 @@ expect { | |||
180 | } | 180 | } |
181 | expect { | 181 | expect { |
182 | timeout {puts "TESTING ERROR 30\n";exit} | 182 | timeout {puts "TESTING ERROR 30\n";exit} |
183 | "Child process initialized" | 183 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
184 | } | 184 | } |
185 | sleep 1 | 185 | sleep 1 |
186 | send -- "bash\r" | 186 | send -- "bash\r" |
diff --git a/test/network/net_veth.exp b/test/network/net_veth.exp index 22388ed89..781cc194c 100755 --- a/test/network/net_veth.exp +++ b/test/network/net_veth.exp | |||
@@ -42,7 +42,7 @@ expect { | |||
42 | } | 42 | } |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 9\n";exit} | 44 | timeout {puts "TESTING ERROR 9\n";exit} |
45 | "Child process initialized" | 45 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
46 | } | 46 | } |
47 | sleep 1 | 47 | sleep 1 |
48 | send -- "exit\r" | 48 | send -- "exit\r" |
@@ -119,7 +119,7 @@ expect { | |||
119 | } | 119 | } |
120 | expect { | 120 | expect { |
121 | timeout {puts "TESTING ERROR 27\n";exit} | 121 | timeout {puts "TESTING ERROR 27\n";exit} |
122 | "Child process initialized" | 122 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
123 | } | 123 | } |
124 | sleep 1 | 124 | sleep 1 |
125 | send -- "exit\r" | 125 | send -- "exit\r" |
diff --git a/test/network/netfilter-template.exp b/test/network/netfilter-template.exp index f77e4f025..ba09aaea7 100755 --- a/test/network/netfilter-template.exp +++ b/test/network/netfilter-template.exp | |||
@@ -18,7 +18,7 @@ sleep 1 | |||
18 | send -- "firejail --net=br1 --ip=10.10.30.10 --name=test1 --netfilter=/etc/firejail/tcpserver.net,5555 ./tcpserver 5555\r" | 18 | send -- "firejail --net=br1 --ip=10.10.30.10 --name=test1 --netfilter=/etc/firejail/tcpserver.net,5555 ./tcpserver 5555\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 1\n";exit} | 20 | timeout {puts "TESTING ERROR 1\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 | ||
diff --git a/test/network/netns.exp b/test/network/netns.exp index f33e5f3c0..034f4736e 100755 --- a/test/network/netns.exp +++ b/test/network/netns.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --netns=red --noprofile\r" | 10 | send -- "firejail --netns=red --noprofile\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | after 100 | 15 | after 100 |
16 | 16 | ||
diff --git a/test/network/netstats.exp b/test/network/netstats.exp index b07fbd535..e06e6769d 100755 --- a/test/network/netstats.exp +++ b/test/network/netstats.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --net=eth0 --name=test1\r" | 10 | send -- "firejail --net=eth0 --name=test1\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 9\n";exit} | 12 | timeout {puts "TESTING ERROR 9\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -18,7 +18,7 @@ spawn $env(SHELL) | |||
18 | send -- "firejail --net=eth0 --name=test2\r" | 18 | send -- "firejail --net=eth0 --name=test2\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 9\n";exit} | 20 | timeout {puts "TESTING ERROR 9\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 | ||
diff --git a/test/network/veth-name.exp b/test/network/veth-name.exp index 1be6a15ea..1c9f23c54 100755 --- a/test/network/veth-name.exp +++ b/test/network/veth-name.exp | |||
@@ -23,7 +23,7 @@ expect { | |||
23 | } | 23 | } |
24 | expect { | 24 | expect { |
25 | timeout {puts "TESTING ERROR 3\n";exit} | 25 | timeout {puts "TESTING ERROR 3\n";exit} |
26 | "Child process initialized" | 26 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
27 | } | 27 | } |
28 | sleep 1 | 28 | sleep 1 |
29 | 29 | ||
@@ -55,7 +55,7 @@ expect { | |||
55 | } | 55 | } |
56 | expect { | 56 | expect { |
57 | timeout {puts "TESTING ERROR 9\n";exit} | 57 | timeout {puts "TESTING ERROR 9\n";exit} |
58 | "Child process initialized" | 58 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
59 | } | 59 | } |
60 | sleep 1 | 60 | sleep 1 |
61 | 61 | ||
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 | ||
diff --git a/test/private-lib/atril.exp b/test/private-lib/atril.exp index b420f4477..cad118c0a 100755 --- a/test/private-lib/atril.exp +++ b/test/private-lib/atril.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/private-lib/eog.exp b/test/private-lib/eog.exp index dc6771482..c4bfc0aa7 100755 --- a/test/private-lib/eog.exp +++ b/test/private-lib/eog.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/private-lib/eom.exp b/test/private-lib/eom.exp index 6ddf3edbe..a7709b0ec 100755 --- a/test/private-lib/eom.exp +++ b/test/private-lib/eom.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/private-lib/evince.exp b/test/private-lib/evince.exp index e21ce1fb9..8f54ee345 100755 --- a/test/private-lib/evince.exp +++ b/test/private-lib/evince.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/private-lib/galculator.exp b/test/private-lib/galculator.exp index 7438b0be6..4cf6b6a73 100755 --- a/test/private-lib/galculator.exp +++ b/test/private-lib/galculator.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/private-lib/gedit.exp b/test/private-lib/gedit.exp index c89630613..838ffad21 100755 --- a/test/private-lib/gedit.exp +++ b/test/private-lib/gedit.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/private-lib/gnome-calculator.exp b/test/private-lib/gnome-calculator.exp index e0e4b5f8c..37e6b86cb 100755 --- a/test/private-lib/gnome-calculator.exp +++ b/test/private-lib/gnome-calculator.exp | |||
@@ -16,7 +16,7 @@ expect { | |||
16 | } | 16 | } |
17 | expect { | 17 | expect { |
18 | timeout {puts "TESTING ERROR 1\n";exit} | 18 | timeout {puts "TESTING ERROR 1\n";exit} |
19 | "Child process initialized" | 19 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
20 | } | 20 | } |
21 | sleep 3 | 21 | sleep 3 |
22 | 22 | ||
@@ -43,7 +43,7 @@ expect { | |||
43 | send -- "firejail --name=blablabla\r" | 43 | send -- "firejail --name=blablabla\r" |
44 | expect { | 44 | expect { |
45 | timeout {puts "TESTING ERROR 4\n";exit} | 45 | timeout {puts "TESTING ERROR 4\n";exit} |
46 | "Child process initialized" | 46 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
47 | } | 47 | } |
48 | sleep 2 | 48 | sleep 2 |
49 | 49 | ||
diff --git a/test/private-lib/gnome-logs.exp b/test/private-lib/gnome-logs.exp index c5ed97578..3f0cc3544 100755 --- a/test/private-lib/gnome-logs.exp +++ b/test/private-lib/gnome-logs.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/private-lib/gnome-nettool.exp b/test/private-lib/gnome-nettool.exp index 51382ba0b..3a08fe3df 100755 --- a/test/private-lib/gnome-nettool.exp +++ b/test/private-lib/gnome-nettool.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/private-lib/gnome-system-log.exp b/test/private-lib/gnome-system-log.exp index 60047e020..5ab819a89 100755 --- a/test/private-lib/gnome-system-log.exp +++ b/test/private-lib/gnome-system-log.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/private-lib/gpicview.exp b/test/private-lib/gpicview.exp index 7aa9e6e16..ea0964787 100755 --- a/test/private-lib/gpicview.exp +++ b/test/private-lib/gpicview.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/private-lib/leafpad.exp b/test/private-lib/leafpad.exp index 79f13d98c..9e4dc7fed 100755 --- a/test/private-lib/leafpad.exp +++ b/test/private-lib/leafpad.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/private-lib/mousepad.exp b/test/private-lib/mousepad.exp index 96923caa9..9c7501473 100755 --- a/test/private-lib/mousepad.exp +++ b/test/private-lib/mousepad.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/private-lib/pavucontrol.exp b/test/private-lib/pavucontrol.exp index 896a53863..3aeda709a 100755 --- a/test/private-lib/pavucontrol.exp +++ b/test/private-lib/pavucontrol.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/private-lib/pluma.exp b/test/private-lib/pluma.exp index 955142511..64cb16d5a 100755 --- a/test/private-lib/pluma.exp +++ b/test/private-lib/pluma.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/private-lib/transmission-gtk.exp b/test/private-lib/transmission-gtk.exp index 4ecc4fa5a..0f297cc42 100755 --- a/test/private-lib/transmission-gtk.exp +++ b/test/private-lib/transmission-gtk.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/private-lib/xcalc.exp b/test/private-lib/xcalc.exp index 6eb56e360..e9c541684 100755 --- a/test/private-lib/xcalc.exp +++ b/test/private-lib/xcalc.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 3 | 19 | sleep 3 |
20 | 20 | ||
@@ -41,7 +41,7 @@ expect { | |||
41 | send -- "firejail --name=blablabla\r" | 41 | send -- "firejail --name=blablabla\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Child process initialized" | 44 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
45 | } | 45 | } |
46 | sleep 2 | 46 | sleep 2 |
47 | 47 | ||
diff --git a/test/profiles/conditional.exp b/test/profiles/conditional.exp index 97ac01503..40bae3878 100755 --- a/test/profiles/conditional.exp +++ b/test/profiles/conditional.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 | after 100 | 19 | after 100 |
20 | send -- "exit\r" | 20 | send -- "exit\r" |
@@ -24,7 +24,7 @@ send -- "firejail --debug --profile=cond1.profile\r" | |||
24 | expect { | 24 | expect { |
25 | timeout {puts "TESTING ERROR 2\n";exit} | 25 | timeout {puts "TESTING ERROR 2\n";exit} |
26 | "conditional HAS_NODBUS, private" {puts "TESTING ERROR 3\n";exit} | 26 | "conditional HAS_NODBUS, private" {puts "TESTING ERROR 3\n";exit} |
27 | "Child process initialized" | 27 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
28 | } | 28 | } |
29 | after 100 | 29 | after 100 |
30 | send -- "exit\r" | 30 | send -- "exit\r" |
diff --git a/test/profiles/ignore.exp b/test/profiles/ignore.exp index 7d13a8b72..df4337e1e 100755 --- a/test/profiles/ignore.exp +++ b/test/profiles/ignore.exp | |||
@@ -17,7 +17,7 @@ send -- "firejail --debug --ignore=seccomp\r" | |||
17 | expect { | 17 | expect { |
18 | timeout {puts "TESTING ERROR 1\n";exit} | 18 | timeout {puts "TESTING ERROR 1\n";exit} |
19 | BLACKLIST {puts "TESTING ERROR 2\n";exit} | 19 | BLACKLIST {puts "TESTING ERROR 2\n";exit} |
20 | "Child process initialized" | 20 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
21 | } | 21 | } |
22 | after 100 | 22 | after 100 |
23 | send -- "exit\r" | 23 | send -- "exit\r" |
@@ -26,7 +26,7 @@ sleep 1 | |||
26 | send -- "firejail --ignore=seccomp --ignore=shell --profile=ignore.profile \r" | 26 | send -- "firejail --ignore=seccomp --ignore=shell --profile=ignore.profile \r" |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 3\n";exit} | 28 | timeout {puts "TESTING ERROR 3\n";exit} |
29 | "Child process initialized" | 29 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
30 | } | 30 | } |
31 | after 100 | 31 | after 100 |
32 | 32 | ||
@@ -42,7 +42,7 @@ sleep 1 | |||
42 | send -- "firejail --ignore=private --ignore=shell --profile=ignore.profile \r" | 42 | send -- "firejail --ignore=private --ignore=shell --profile=ignore.profile \r" |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 5\n";exit} | 44 | timeout {puts "TESTING ERROR 5\n";exit} |
45 | "Child process initialized" | 45 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
46 | } | 46 | } |
47 | after 100 | 47 | after 100 |
48 | 48 | ||
@@ -59,7 +59,7 @@ send -- "firejail --debug --profile=ignore2.profile\r" | |||
59 | expect { | 59 | expect { |
60 | timeout {puts "TESTING ERROR 7\n";exit} | 60 | timeout {puts "TESTING ERROR 7\n";exit} |
61 | BLACKLIST {puts "TESTING ERROR 8\n";exit} | 61 | BLACKLIST {puts "TESTING ERROR 8\n";exit} |
62 | "Child process initialized" | 62 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
63 | } | 63 | } |
64 | 64 | ||
65 | after 100 | 65 | after 100 |
@@ -69,7 +69,7 @@ sleep 1 | |||
69 | send -- "firejail --ignore=quiet --ignore=shell --profile=ignore.profile \r" | 69 | send -- "firejail --ignore=quiet --ignore=shell --profile=ignore.profile \r" |
70 | expect { | 70 | expect { |
71 | timeout {puts "TESTING ERROR 9\n";exit} | 71 | timeout {puts "TESTING ERROR 9\n";exit} |
72 | "Child process initialized" | 72 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
73 | } | 73 | } |
74 | after 100 | 74 | after 100 |
75 | 75 | ||
diff --git a/test/profiles/profile_comment.exp b/test/profiles/profile_comment.exp index 907635c2f..73e92d864 100755 --- a/test/profiles/profile_comment.exp +++ b/test/profiles/profile_comment.exp | |||
@@ -15,7 +15,7 @@ sleep 1 | |||
15 | send -- "firejail --profile=comment.profile /usr/bin/true\r" | 15 | send -- "firejail --profile=comment.profile /usr/bin/true\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 | expect { | 20 | expect { |
21 | timeout {puts "TESTING ERROR 1\n";exit} | 21 | timeout {puts "TESTING ERROR 1\n";exit} |
@@ -36,7 +36,7 @@ after 100 | |||
36 | send -- "firejail --profile=/tmp/firejailtest.profile /usr/bin/true\r" | 36 | send -- "firejail --profile=/tmp/firejailtest.profile /usr/bin/true\r" |
37 | expect { | 37 | expect { |
38 | timeout {puts "TESTING ERROR 3\n";exit} | 38 | timeout {puts "TESTING ERROR 3\n";exit} |
39 | "Child process initialized" | 39 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
40 | } | 40 | } |
41 | expect { | 41 | expect { |
42 | timeout {puts "TESTING ERROR 4\n";exit} | 42 | timeout {puts "TESTING ERROR 4\n";exit} |
diff --git a/test/profiles/profile_followlnk.exp b/test/profiles/profile_followlnk.exp index c41276cfb..112acbbc9 100755 --- a/test/profiles/profile_followlnk.exp +++ b/test/profiles/profile_followlnk.exp | |||
@@ -16,7 +16,7 @@ sleep 1 | |||
16 | send -- "firejail --profile=readonly-lnk.profile\r" | 16 | send -- "firejail --profile=readonly-lnk.profile\r" |
17 | expect { | 17 | expect { |
18 | timeout {puts "TESTING ERROR 0\n";exit} | 18 | timeout {puts "TESTING ERROR 0\n";exit} |
19 | "Child process initialized" | 19 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
20 | } | 20 | } |
21 | 21 | ||
22 | send -- "ls > /tmp/firejailtestdirlnk/ttt\r" | 22 | send -- "ls > /tmp/firejailtestdirlnk/ttt\r" |
diff --git a/test/profiles/profile_readonly.exp b/test/profiles/profile_readonly.exp index 8dc598034..4c1bcba89 100755 --- a/test/profiles/profile_readonly.exp +++ b/test/profiles/profile_readonly.exp | |||
@@ -14,7 +14,7 @@ sleep 1 | |||
14 | send -- "firejail --profile=readonly.profile\r" | 14 | send -- "firejail --profile=readonly.profile\r" |
15 | expect { | 15 | expect { |
16 | timeout {puts "TESTING ERROR 0\n";exit} | 16 | timeout {puts "TESTING ERROR 0\n";exit} |
17 | "Child process initialized" | 17 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
18 | } | 18 | } |
19 | sleep 2 | 19 | sleep 2 |
20 | 20 | ||
diff --git a/test/profiles/profile_syntax.exp b/test/profiles/profile_syntax.exp index d02bb65f0..2bce76d83 100755 --- a/test/profiles/profile_syntax.exp +++ b/test/profiles/profile_syntax.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --profile=test.profile\r" | 10 | send -- "firejail --profile=test.profile\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | 15 | ||
16 | sleep 2 | 16 | sleep 2 |
diff --git a/test/root/apache2.exp b/test/root/apache2.exp index c3e520224..a6b25de2f 100755 --- a/test/root/apache2.exp +++ b/test/root/apache2.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=apache /etc/init.d/apache2 start\r" | 10 | send -- "firejail --name=apache /etc/init.d/apache2 start\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
diff --git a/test/root/cgroup.exp b/test/root/cgroup.exp index f64edf4b9..9a1bbe161 100755 --- a/test/root/cgroup.exp +++ b/test/root/cgroup.exp | |||
@@ -20,7 +20,7 @@ expect { | |||
20 | send -- "firejail --name=\"join testing\" --cgroup=/sys/fs/cgroup/systemd/firejail/tasks\r" | 20 | send -- "firejail --name=\"join testing\" --cgroup=/sys/fs/cgroup/systemd/firejail/tasks\r" |
21 | expect { | 21 | expect { |
22 | timeout {puts "TESTING ERROR 1\n";exit} | 22 | timeout {puts "TESTING ERROR 1\n";exit} |
23 | "Child process initialized" | 23 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
24 | } | 24 | } |
25 | sleep 2 | 25 | sleep 2 |
26 | 26 | ||
@@ -37,14 +37,18 @@ expect { | |||
37 | timeout {puts "TESTING ERROR 3\n";exit} | 37 | timeout {puts "TESTING ERROR 3\n";exit} |
38 | "Switching to pid" | 38 | "Switching to pid" |
39 | } | 39 | } |
40 | expect { | ||
41 | timeout {puts "TESTING ERROR 4\n";exit} | ||
42 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" | ||
43 | } | ||
40 | sleep 1 | 44 | sleep 1 |
41 | send -- "ps aux\r" | 45 | send -- "ps aux\r" |
42 | expect { | 46 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 47 | timeout {puts "TESTING ERROR 5\n";exit} |
44 | "/bin/bash" | 48 | "/bin/bash" |
45 | } | 49 | } |
46 | expect { | 50 | expect { |
47 | timeout {puts "TESTING ERROR 5\n";exit} | 51 | timeout {puts "TESTING ERROR 6\n";exit} |
48 | "/bin/bash" | 52 | "/bin/bash" |
49 | } | 53 | } |
50 | 54 | ||
@@ -53,7 +57,7 @@ after 100 | |||
53 | spawn $env(SHELL) | 57 | spawn $env(SHELL) |
54 | send -- "wc -l /sys/fs/cgroup/systemd/firejail/tasks\r" | 58 | send -- "wc -l /sys/fs/cgroup/systemd/firejail/tasks\r" |
55 | expect { | 59 | expect { |
56 | timeout {puts "TESTING ERROR 6\n";exit} | 60 | timeout {puts "TESTING ERROR 7\n";exit} |
57 | "3" | 61 | "3" |
58 | } | 62 | } |
59 | after 100 | 63 | after 100 |
diff --git a/test/root/firemon-events.exp b/test/root/firemon-events.exp index f2c0879db..8eab93a2a 100755 --- a/test/root/firemon-events.exp +++ b/test/root/firemon-events.exp | |||
@@ -18,7 +18,7 @@ set firejail_id $spawn_id | |||
18 | send -- "firejail\r" | 18 | send -- "firejail\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 | 23 | ||
24 | # get messages on firemon | 24 | # get messages on firemon |
diff --git a/test/root/isc-dhcp.exp b/test/root/isc-dhcp.exp index 86291a9f9..20e5ef408 100755 --- a/test/root/isc-dhcp.exp +++ b/test/root/isc-dhcp.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=dhcpd /etc/init.d/isc-dhcp-server start\r" | 10 | send -- "firejail --name=dhcpd /etc/init.d/isc-dhcp-server start\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
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 |
diff --git a/test/root/login_nobody.exp b/test/root/login_nobody.exp index cf3df268d..9c0932196 100755 --- a/test/root/login_nobody.exp +++ b/test/root/login_nobody.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "su - nobody -s /usr/bin/firejail\r" | 11 | send -- "su - nobody -s /usr/bin/firejail\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 | after 100 | 16 | after 100 |
17 | 17 | ||
diff --git a/test/root/nginx.exp b/test/root/nginx.exp index af1ab8eb9..40d8cb51e 100755 --- a/test/root/nginx.exp +++ b/test/root/nginx.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=nginx /etc/init.d/nginx start\r" | 10 | send -- "firejail --name=nginx /etc/init.d/nginx start\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
diff --git a/test/root/option_bind_directory.exp b/test/root/option_bind_directory.exp index 122a1ea79..4fabf0cd8 100755 --- a/test/root/option_bind_directory.exp +++ b/test/root/option_bind_directory.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --bind=/tmp/chroot,mntpoint\r" | 10 | send -- "firejail --bind=/tmp/chroot,mntpoint\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/root/option_bind_file.exp b/test/root/option_bind_file.exp index 4e02638e6..6c796a2b0 100755 --- a/test/root/option_bind_file.exp +++ b/test/root/option_bind_file.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --bind=tmpfile,/etc/passwd\r" | 10 | send -- "firejail --bind=tmpfile,/etc/passwd\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/root/option_tmpfs.exp b/test/root/option_tmpfs.exp index b40335680..13820afe8 100755 --- a/test/root/option_tmpfs.exp +++ b/test/root/option_tmpfs.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --tmpfs=/var\r" | 10 | send -- "firejail --tmpfs=/var\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/root/private.exp b/test/root/private.exp index edc2520a2..70d0218fa 100755 --- a/test/root/private.exp +++ b/test/root/private.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --private\r" | 10 | send -- "firejail --private\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
@@ -42,7 +42,7 @@ after 100 | |||
42 | send -- "firejail --private-opt=firejail-test-file,firejail-test-dir --debug\r" | 42 | send -- "firejail --private-opt=firejail-test-file,firejail-test-dir --debug\r" |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 3\n";exit} | 44 | timeout {puts "TESTING ERROR 3\n";exit} |
45 | "Child process initialized" | 45 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
46 | } | 46 | } |
47 | sleep 1 | 47 | sleep 1 |
48 | 48 | ||
@@ -57,7 +57,7 @@ sleep 1 | |||
57 | send -- "firejail --whitelist=/opt/firejail-test-file --whitelist=/opt/firejail-test-dir --debug\r" | 57 | send -- "firejail --whitelist=/opt/firejail-test-file --whitelist=/opt/firejail-test-dir --debug\r" |
58 | expect { | 58 | expect { |
59 | timeout {puts "TESTING ERROR 3.1\n";exit} | 59 | timeout {puts "TESTING ERROR 3.1\n";exit} |
60 | "Child process initialized" | 60 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
61 | } | 61 | } |
62 | sleep 1 | 62 | sleep 1 |
63 | 63 | ||
@@ -80,7 +80,7 @@ after 100 | |||
80 | send -- "firejail --private-srv=firejail-test-file,firejail-test-dir --debug\r" | 80 | send -- "firejail --private-srv=firejail-test-file,firejail-test-dir --debug\r" |
81 | expect { | 81 | expect { |
82 | timeout {puts "TESTING ERROR 5\n";exit} | 82 | timeout {puts "TESTING ERROR 5\n";exit} |
83 | "Child process initialized" | 83 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
84 | } | 84 | } |
85 | sleep 1 | 85 | sleep 1 |
86 | 86 | ||
@@ -95,7 +95,7 @@ sleep 1 | |||
95 | send -- "firejail --whitelist=/srv/firejail-test-file --whitelist=/srv/firejail-test-dir --debug\r" | 95 | send -- "firejail --whitelist=/srv/firejail-test-file --whitelist=/srv/firejail-test-dir --debug\r" |
96 | expect { | 96 | expect { |
97 | timeout {puts "TESTING ERROR 5.1\n";exit} | 97 | timeout {puts "TESTING ERROR 5.1\n";exit} |
98 | "Child process initialized" | 98 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
99 | } | 99 | } |
100 | sleep 1 | 100 | sleep 1 |
101 | 101 | ||
diff --git a/test/root/profile_tmpfs.exp b/test/root/profile_tmpfs.exp index 8625f100a..fba63773f 100755 --- a/test/root/profile_tmpfs.exp +++ b/test/root/profile_tmpfs.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --profile=tmpfs.profile\r" | 10 | send -- "firejail --profile=tmpfs.profile\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/root/seccomp-chmod.exp b/test/root/seccomp-chmod.exp index 8fbb687d5..ef0453548 100755 --- a/test/root/seccomp-chmod.exp +++ b/test/root/seccomp-chmod.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --seccomp=chmod,fchmod,fchmodat --private\r" | 10 | send -- "firejail --seccomp=chmod,fchmod,fchmodat --private\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
diff --git a/test/root/seccomp-chown.exp b/test/root/seccomp-chown.exp index 0d9262494..968a4bc96 100755 --- a/test/root/seccomp-chown.exp +++ b/test/root/seccomp-chown.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --seccomp=chown,fchown,fchownat,lchown --private\r" | 10 | send -- "firejail --seccomp=chown,fchown,fchownat,lchown --private\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
diff --git a/test/root/seccomp-umount.exp b/test/root/seccomp-umount.exp index 51a7c7647..b99ec30f7 100755 --- a/test/root/seccomp-umount.exp +++ b/test/root/seccomp-umount.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --seccomp --noprofile\r" | 10 | send -- "firejail --seccomp --noprofile\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
diff --git a/test/root/snmpd.exp b/test/root/snmpd.exp index 7658cfc68..510abfbad 100755 --- a/test/root/snmpd.exp +++ b/test/root/snmpd.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=snmpd /etc/init.d/snmpd start\r" | 10 | send -- "firejail --name=snmpd /etc/init.d/snmpd start\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
diff --git a/test/root/unbound.exp b/test/root/unbound.exp index 9e000be5e..6440304b2 100755 --- a/test/root/unbound.exp +++ b/test/root/unbound.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=unbound unbound\r" | 10 | send -- "firejail --name=unbound unbound\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
diff --git a/test/root/whitelist.exp b/test/root/whitelist.exp index 1e29e3fef..2397f6a90 100755 --- a/test/root/whitelist.exp +++ b/test/root/whitelist.exp | |||
@@ -16,7 +16,7 @@ after 100 | |||
16 | send -- "firejail --whitelist=/mnt/firejail-test-file --whitelist=/mnt/firejail-test-dir --debug\r" | 16 | send -- "firejail --whitelist=/mnt/firejail-test-file --whitelist=/mnt/firejail-test-dir --debug\r" |
17 | expect { | 17 | expect { |
18 | timeout {puts "TESTING ERROR 0\n";exit} | 18 | timeout {puts "TESTING ERROR 0\n";exit} |
19 | "Child process initialized" | 19 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
20 | } | 20 | } |
21 | sleep 1 | 21 | sleep 1 |
22 | 22 | ||
@@ -39,7 +39,7 @@ after 100 | |||
39 | send -- "firejail --whitelist=/opt/firejail-test-file --whitelist=/opt/firejail-test-dir --debug\r" | 39 | send -- "firejail --whitelist=/opt/firejail-test-file --whitelist=/opt/firejail-test-dir --debug\r" |
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 2\n";exit} | 41 | timeout {puts "TESTING ERROR 2\n";exit} |
42 | "Child process initialized" | 42 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
43 | } | 43 | } |
44 | sleep 1 | 44 | sleep 1 |
45 | 45 | ||
@@ -61,7 +61,7 @@ after 100 | |||
61 | send -- "firejail --whitelist=/media/firejail-test-file --whitelist=/media/firejail-test-dir --debug\r" | 61 | send -- "firejail --whitelist=/media/firejail-test-file --whitelist=/media/firejail-test-dir --debug\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 | ||
@@ -78,7 +78,7 @@ sleep 1 | |||
78 | send -- "firejail --whitelist=/var/run --whitelist=/var/lock --debug\r" | 78 | send -- "firejail --whitelist=/var/run --whitelist=/var/lock --debug\r" |
79 | expect { | 79 | expect { |
80 | timeout {puts "TESTING ERROR 6\n";exit} | 80 | timeout {puts "TESTING ERROR 6\n";exit} |
81 | "Child process initialized" | 81 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
82 | } | 82 | } |
83 | sleep 1 | 83 | sleep 1 |
84 | 84 | ||
@@ -100,7 +100,7 @@ after 100 | |||
100 | send -- "firejail --whitelist=/srv/firejail-test-file --whitelist=/srv/firejail-test-dir --debug\r" | 100 | send -- "firejail --whitelist=/srv/firejail-test-file --whitelist=/srv/firejail-test-dir --debug\r" |
101 | expect { | 101 | expect { |
102 | timeout {puts "TESTING ERROR 8\n";exit} | 102 | timeout {puts "TESTING ERROR 8\n";exit} |
103 | "Child process initialized" | 103 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
104 | } | 104 | } |
105 | sleep 1 | 105 | sleep 1 |
106 | 106 | ||
diff --git a/test/ssh/login.exp b/test/ssh/login.exp index d6ff434b5..5d6a6216b 100755 --- a/test/ssh/login.exp +++ b/test/ssh/login.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "ssh firejail-test@0\r" | 10 | send -- "ssh firejail-test@0\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" {puts "OK\n"} | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "OK\n"} |
14 | "an existing sandbox was detected" {puts "OK\n"} | 14 | "an existing sandbox was detected" {puts "OK\n"} |
15 | } | 15 | } |
16 | sleep 1 | 16 | sleep 1 |
diff --git a/test/ssh/scp.exp b/test/ssh/scp.exp index 2305b8f50..13163564b 100755 --- a/test/ssh/scp.exp +++ b/test/ssh/scp.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "ssh firejail-test@0\r" | 10 | send -- "ssh firejail-test@0\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" {puts "OK\n"} | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "OK\n"} |
14 | "an existing sandbox was detected" {puts "OK\n"} | 14 | "an existing sandbox was detected" {puts "OK\n"} |
15 | } | 15 | } |
16 | sleep 1 | 16 | sleep 1 |
@@ -33,7 +33,7 @@ sleep 1 | |||
33 | send -- "ssh firejail-test@0\r" | 33 | send -- "ssh firejail-test@0\r" |
34 | expect { | 34 | expect { |
35 | timeout {puts "TESTING ERROR 2\n";exit} | 35 | timeout {puts "TESTING ERROR 2\n";exit} |
36 | "Child process initialized" {puts "OK\n"} | 36 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "OK\n"} |
37 | "an existing sandbox was detected" {puts "OK\n"} | 37 | "an existing sandbox was detected" {puts "OK\n"} |
38 | } | 38 | } |
39 | sleep 1 | 39 | sleep 1 |
diff --git a/test/ssh/sftp.exp b/test/ssh/sftp.exp index bc1647b0a..01c1e7e04 100755 --- a/test/ssh/sftp.exp +++ b/test/ssh/sftp.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "ssh firejail-test@0\r" | 10 | send -- "ssh firejail-test@0\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" {puts "OK\n"} | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "OK\n"} |
14 | "an existing sandbox was detected" {puts "OK\n"} | 14 | "an existing sandbox was detected" {puts "OK\n"} |
15 | } | 15 | } |
16 | sleep 1 | 16 | sleep 1 |
@@ -45,7 +45,7 @@ sleep 1 | |||
45 | send -- "ssh firejail-test@0\r" | 45 | send -- "ssh firejail-test@0\r" |
46 | expect { | 46 | expect { |
47 | timeout {puts "TESTING ERROR 4\n";exit} | 47 | timeout {puts "TESTING ERROR 4\n";exit} |
48 | "Child process initialized" {puts "OK\n"} | 48 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "OK\n"} |
49 | "an existing sandbox was detected" {puts "OK\n"} | 49 | "an existing sandbox was detected" {puts "OK\n"} |
50 | } | 50 | } |
51 | sleep 1 | 51 | sleep 1 |
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 |
diff --git a/test/utils/caps-print.exp b/test/utils/caps-print.exp index 76aad24f5..b6ccd05d4 100755 --- a/test/utils/caps-print.exp +++ b/test/utils/caps-print.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=test\r" | 10 | send -- "firejail --name=test\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
diff --git a/test/utils/cpu-print.exp b/test/utils/cpu-print.exp index de081e82b..3e4d63f2a 100755 --- a/test/utils/cpu-print.exp +++ b/test/utils/cpu-print.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=test --cpu=0\r" | 10 | send -- "firejail --name=test --cpu=0\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | send -- "cat /proc/self/status | grep Cpus\r" | 16 | send -- "cat /proc/self/status | grep Cpus\r" |
@@ -30,7 +30,7 @@ sleep 1 | |||
30 | send -- "firejail --name=test --cpu=1\r" | 30 | send -- "firejail --name=test --cpu=1\r" |
31 | expect { | 31 | expect { |
32 | timeout {puts "TESTING ERROR 3\n";exit} | 32 | timeout {puts "TESTING ERROR 3\n";exit} |
33 | "Child process initialized" | 33 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
34 | } | 34 | } |
35 | sleep 1 | 35 | sleep 1 |
36 | 36 | ||
diff --git a/test/utils/dns-print.exp b/test/utils/dns-print.exp index 034f2a6b9..c0cf2ff0f 100755 --- a/test/utils/dns-print.exp +++ b/test/utils/dns-print.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=test --dns=1.2.3.4 --dns=::2\r" | 10 | send -- "firejail --name=test --dns=1.2.3.4 --dns=::2\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
diff --git a/test/utils/firemon-caps.exp b/test/utils/firemon-caps.exp index dc229a85d..02b317341 100755 --- a/test/utils/firemon-caps.exp +++ b/test/utils/firemon-caps.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=bingo1 --noprofile --caps\r" | 10 | send -- "firejail --name=bingo1 --noprofile --caps\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -18,7 +18,7 @@ spawn $env(SHELL) | |||
18 | send -- "firejail --name=bingo2 --noprofile\r" | 18 | send -- "firejail --name=bingo2 --noprofile\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 1\n";exit} | 20 | timeout {puts "TESTING ERROR 1\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 | ||
@@ -26,7 +26,7 @@ spawn $env(SHELL) | |||
26 | send -- "firejail --name=bingo3 --noprofile --caps.drop=all\r" | 26 | send -- "firejail --name=bingo3 --noprofile --caps.drop=all\r" |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 2\n";exit} | 28 | timeout {puts "TESTING ERROR 2\n";exit} |
29 | "Child process initialized" | 29 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
30 | } | 30 | } |
31 | sleep 1 | 31 | sleep 1 |
32 | 32 | ||
@@ -34,7 +34,7 @@ spawn $env(SHELL) | |||
34 | send -- "firejail --noprofile --name=bingo4 --caps.drop=chown,kill\r" | 34 | send -- "firejail --noprofile --name=bingo4 --caps.drop=chown,kill\r" |
35 | expect { | 35 | expect { |
36 | timeout {puts "TESTING ERROR 3\n";exit} | 36 | timeout {puts "TESTING ERROR 3\n";exit} |
37 | "Child process initialized" | 37 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
38 | } | 38 | } |
39 | sleep 1 | 39 | sleep 1 |
40 | 40 | ||
@@ -42,7 +42,7 @@ spawn $env(SHELL) | |||
42 | send -- "firejail --noprofile --name=bingo5 --caps.keep=chown,kill\r" | 42 | send -- "firejail --noprofile --name=bingo5 --caps.keep=chown,kill\r" |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 4\n";exit} | 44 | timeout {puts "TESTING ERROR 4\n";exit} |
45 | "Child process initialized" | 45 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
46 | } | 46 | } |
47 | sleep 1 | 47 | sleep 1 |
48 | 48 | ||
@@ -50,7 +50,7 @@ spawn $env(SHELL) | |||
50 | send -- "firejail --name=bingo6 --profile=caps1.profile\r" | 50 | send -- "firejail --name=bingo6 --profile=caps1.profile\r" |
51 | expect { | 51 | expect { |
52 | timeout {puts "TESTING ERROR 5\n";exit} | 52 | timeout {puts "TESTING ERROR 5\n";exit} |
53 | "Child process initialized" | 53 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
54 | } | 54 | } |
55 | sleep 1 | 55 | sleep 1 |
56 | 56 | ||
@@ -58,7 +58,7 @@ spawn $env(SHELL) | |||
58 | send -- "firejail --name=bingo7 --profile=caps2.profile\r" | 58 | send -- "firejail --name=bingo7 --profile=caps2.profile\r" |
59 | expect { | 59 | expect { |
60 | timeout {puts "TESTING ERROR 0\n";exit} | 60 | timeout {puts "TESTING ERROR 0\n";exit} |
61 | "Child process initialized" | 61 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
62 | } | 62 | } |
63 | sleep 1 | 63 | sleep 1 |
64 | 64 | ||
diff --git a/test/utils/firemon-cgroup.exp b/test/utils/firemon-cgroup.exp index 1e4c4a398..2dbc04a50 100755 --- a/test/utils/firemon-cgroup.exp +++ b/test/utils/firemon-cgroup.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=test1\r" | 10 | send -- "firejail --name=test1\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -18,7 +18,7 @@ spawn $env(SHELL) | |||
18 | send -- "firejail --name=test2\r" | 18 | send -- "firejail --name=test2\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 1\n";exit} | 20 | timeout {puts "TESTING ERROR 1\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 | ||
diff --git a/test/utils/firemon-cpu.exp b/test/utils/firemon-cpu.exp index cb9cff188..db5069ede 100755 --- a/test/utils/firemon-cpu.exp +++ b/test/utils/firemon-cpu.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=test1\r" | 10 | send -- "firejail --name=test1\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -18,7 +18,7 @@ spawn $env(SHELL) | |||
18 | send -- "firejail --name=test2\r" | 18 | send -- "firejail --name=test2\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 1\n";exit} | 20 | timeout {puts "TESTING ERROR 1\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 | ||
diff --git a/test/utils/firemon-name.exp b/test/utils/firemon-name.exp index e28a45cfb..f8161cc81 100755 --- a/test/utils/firemon-name.exp +++ b/test/utils/firemon-name.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=test\r" | 10 | send -- "firejail --name=test\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
diff --git a/test/utils/firemon-seccomp.exp b/test/utils/firemon-seccomp.exp index bbc38f27a..7eb6f9168 100755 --- a/test/utils/firemon-seccomp.exp +++ b/test/utils/firemon-seccomp.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --noprofile --name=bingo1 --seccomp\r" | 10 | send -- "firejail --noprofile --name=bingo1 --seccomp\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -18,7 +18,7 @@ spawn $env(SHELL) | |||
18 | send -- "firejail --noprofile --name=bingo2\r" | 18 | send -- "firejail --noprofile --name=bingo2\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 0.1\n";exit} | 20 | timeout {puts "TESTING ERROR 0.1\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 | ||
diff --git a/test/utils/fs-print.exp b/test/utils/fs-print.exp index 09f84ba49..536d59dbd 100755 --- a/test/utils/fs-print.exp +++ b/test/utils/fs-print.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=test\r" | 10 | send -- "firejail --name=test\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
diff --git a/test/utils/join-profile.exp b/test/utils/join-profile.exp index 0f51ca0f7..565010b82 100755 --- a/test/utils/join-profile.exp +++ b/test/utils/join-profile.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --profile=name.profile\r" | 11 | send -- "firejail --profile=name.profile\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 | ||
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 | ||
diff --git a/test/utils/join2.exp b/test/utils/join2.exp index d917d42a3..5f5a6bfe0 100755 --- a/test/utils/join2.exp +++ b/test/utils/join2.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --name=\"join testing\"\r" | 11 | send -- "firejail --name=\"join testing\"\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 | ||
diff --git a/test/utils/join3.exp b/test/utils/join3.exp index 5ace21260..c771b924b 100755 --- a/test/utils/join3.exp +++ b/test/utils/join3.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --name=join\\ testing\r" | 11 | send -- "firejail --name=join\\ testing\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 | ||
diff --git a/test/utils/join4.exp b/test/utils/join4.exp index 23104dc9c..cddf7ad18 100755 --- a/test/utils/join4.exp +++ b/test/utils/join4.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --name=123test\r" | 11 | send -- "firejail --name=123test\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 | ||
diff --git a/test/utils/join5.exp b/test/utils/join5.exp index 44167cffb..c0990ebf1 100755 --- a/test/utils/join5.exp +++ b/test/utils/join5.exp | |||
@@ -9,8 +9,8 @@ match_max 100000 | |||
9 | 9 | ||
10 | send -- "firejail --name=test123 --profile=join5.profile\r" | 10 | send -- "firejail --name=test123 --profile=join5.profile\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 5\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | spawn $env(SHELL) | 16 | spawn $env(SHELL) |
@@ -19,14 +19,18 @@ expect { | |||
19 | timeout {puts "TESTING ERROR 1\n";exit} | 19 | timeout {puts "TESTING ERROR 1\n";exit} |
20 | "Switching to pid" | 20 | "Switching to pid" |
21 | } | 21 | } |
22 | expect { | ||
23 | timeout {puts "TESTING ERROR 2\n";exit} | ||
24 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" | ||
25 | } | ||
22 | sleep 1 | 26 | sleep 1 |
23 | send -- "ps aux\r" | 27 | send -- "ps aux\r" |
24 | expect { | 28 | expect { |
25 | timeout {puts "TESTING ERROR 2\n";exit} | 29 | timeout {puts "TESTING ERROR 3\n";exit} |
26 | "/bin/bash" | 30 | "/bin/bash" |
27 | } | 31 | } |
28 | expect { | 32 | expect { |
29 | timeout {puts "TESTING ERROR 3\n";exit} | 33 | timeout {puts "TESTING ERROR 4\n";exit} |
30 | "/bin/bash" | 34 | "/bin/bash" |
31 | } | 35 | } |
32 | 36 | ||
@@ -35,11 +39,11 @@ after 100 | |||
35 | 39 | ||
36 | send -- "firejail --protocol.print=test123\r" | 40 | send -- "firejail --protocol.print=test123\r" |
37 | expect { | 41 | expect { |
38 | timeout {puts "TESTING ERROR 4\n";exit} | 42 | timeout {puts "TESTING ERROR 5\n";exit} |
39 | "Switching to pid" | 43 | "Switching to pid" |
40 | } | 44 | } |
41 | expect { | 45 | expect { |
42 | timeout {puts "TESTING ERROR 5\n";exit} | 46 | timeout {puts "TESTING ERROR 6\n";exit} |
43 | "unix" | 47 | "unix" |
44 | } | 48 | } |
45 | 49 | ||
diff --git a/test/utils/list.exp b/test/utils/list.exp index 48711fe4b..30344e22a 100755 --- a/test/utils/list.exp +++ b/test/utils/list.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail\r" | 10 | send -- "firejail\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | after 100 | 15 | after 100 |
16 | 16 | ||
@@ -18,7 +18,7 @@ spawn $env(SHELL) | |||
18 | send -- "firejail\r" | 18 | send -- "firejail\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 1\n";exit} | 20 | timeout {puts "TESTING ERROR 1\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | after 100 | 23 | after 100 |
24 | 24 | ||
@@ -26,7 +26,7 @@ spawn $env(SHELL) | |||
26 | send -- "firejail\r" | 26 | send -- "firejail\r" |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 2\n";exit} | 28 | timeout {puts "TESTING ERROR 2\n";exit} |
29 | "Child process initialized" | 29 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
30 | } | 30 | } |
31 | sleep 1 | 31 | sleep 1 |
32 | 32 | ||
diff --git a/test/utils/ls.exp b/test/utils/ls.exp index 9dac20628..6b6c67ede 100755 --- a/test/utils/ls.exp +++ b/test/utils/ls.exp | |||
@@ -14,7 +14,7 @@ sleep 1 | |||
14 | send -- "firejail --private --name=test\r" | 14 | send -- "firejail --private --name=test\r" |
15 | expect { | 15 | expect { |
16 | timeout {puts "TESTING ERROR 0\n";exit} | 16 | timeout {puts "TESTING ERROR 0\n";exit} |
17 | "Child process initialized" | 17 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
18 | } | 18 | } |
19 | sleep 1 | 19 | sleep 1 |
20 | send -- "echo my_testing > ~/lstesting\r" | 20 | send -- "echo my_testing > ~/lstesting\r" |
diff --git a/test/utils/name.exp b/test/utils/name.exp index ade119183..cd4465d41 100755 --- a/test/utils/name.exp +++ b/test/utils/name.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --name=ftest\r" | 11 | send -- "firejail --name=ftest\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 | after 100 | 16 | after 100 |
17 | 17 | ||
@@ -19,7 +19,7 @@ spawn $env(SHELL) | |||
19 | send -- "firejail --name=ftest\r" | 19 | send -- "firejail --name=ftest\r" |
20 | expect { | 20 | expect { |
21 | timeout {puts "TESTING ERROR 1\n";exit} | 21 | timeout {puts "TESTING ERROR 1\n";exit} |
22 | "Child process initialized" | 22 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
23 | } | 23 | } |
24 | after 100 | 24 | after 100 |
25 | 25 | ||
@@ -27,7 +27,7 @@ spawn $env(SHELL) | |||
27 | send -- "firejail --name=ftest\r" | 27 | send -- "firejail --name=ftest\r" |
28 | expect { | 28 | expect { |
29 | timeout {puts "TESTING ERROR 2\n";exit} | 29 | timeout {puts "TESTING ERROR 2\n";exit} |
30 | "Child process initialized" | 30 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
31 | } | 31 | } |
32 | after 100 | 32 | after 100 |
33 | 33 | ||
@@ -35,7 +35,7 @@ spawn $env(SHELL) | |||
35 | send -- "firejail --name=ftest\r" | 35 | send -- "firejail --name=ftest\r" |
36 | expect { | 36 | expect { |
37 | timeout {puts "TESTING ERROR 3\n";exit} | 37 | timeout {puts "TESTING ERROR 3\n";exit} |
38 | "Child process initialized" | 38 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
39 | } | 39 | } |
40 | after 100 | 40 | after 100 |
41 | 41 | ||
@@ -43,7 +43,7 @@ spawn $env(SHELL) | |||
43 | send -- "firejail --name=ftest\r" | 43 | send -- "firejail --name=ftest\r" |
44 | expect { | 44 | expect { |
45 | timeout {puts "TESTING ERROR 4\n";exit} | 45 | timeout {puts "TESTING ERROR 4\n";exit} |
46 | "Child process initialized" | 46 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
47 | } | 47 | } |
48 | after 100 | 48 | after 100 |
49 | 49 | ||
@@ -51,7 +51,7 @@ spawn $env(SHELL) | |||
51 | send -- "firejail --name=ftest\r" | 51 | send -- "firejail --name=ftest\r" |
52 | expect { | 52 | expect { |
53 | timeout {puts "TESTING ERROR 5\n";exit} | 53 | timeout {puts "TESTING ERROR 5\n";exit} |
54 | "Child process initialized" | 54 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
55 | } | 55 | } |
56 | after 100 | 56 | after 100 |
57 | 57 | ||
@@ -59,7 +59,7 @@ spawn $env(SHELL) | |||
59 | send -- "firejail --name=ftest\r" | 59 | send -- "firejail --name=ftest\r" |
60 | expect { | 60 | expect { |
61 | timeout {puts "TESTING ERROR 6\n";exit} | 61 | timeout {puts "TESTING ERROR 6\n";exit} |
62 | "Child process initialized" | 62 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
63 | } | 63 | } |
64 | after 100 | 64 | after 100 |
65 | 65 | ||
@@ -67,7 +67,7 @@ spawn $env(SHELL) | |||
67 | send -- "firejail --name=ftest\r" | 67 | send -- "firejail --name=ftest\r" |
68 | expect { | 68 | expect { |
69 | timeout {puts "TESTING ERROR 7\n";exit} | 69 | timeout {puts "TESTING ERROR 7\n";exit} |
70 | "Child process initialized" | 70 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
71 | } | 71 | } |
72 | after 100 | 72 | after 100 |
73 | 73 | ||
@@ -75,7 +75,7 @@ spawn $env(SHELL) | |||
75 | send -- "firejail --name=ftest\r" | 75 | send -- "firejail --name=ftest\r" |
76 | expect { | 76 | expect { |
77 | timeout {puts "TESTING ERROR 8\n";exit} | 77 | timeout {puts "TESTING ERROR 8\n";exit} |
78 | "Child process initialized" | 78 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
79 | } | 79 | } |
80 | after 100 | 80 | after 100 |
81 | 81 | ||
@@ -83,7 +83,7 @@ spawn $env(SHELL) | |||
83 | send -- "firejail --name=ftest\r" | 83 | send -- "firejail --name=ftest\r" |
84 | expect { | 84 | expect { |
85 | timeout {puts "TESTING ERROR 9\n";exit} | 85 | timeout {puts "TESTING ERROR 9\n";exit} |
86 | "Child process initialized" | 86 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
87 | } | 87 | } |
88 | after 100 | 88 | after 100 |
89 | 89 | ||
@@ -91,7 +91,7 @@ spawn $env(SHELL) | |||
91 | send -- "firejail --name=ftest\r" | 91 | send -- "firejail --name=ftest\r" |
92 | expect { | 92 | expect { |
93 | timeout {puts "TESTING ERROR 10\n";exit} | 93 | timeout {puts "TESTING ERROR 10\n";exit} |
94 | "Child process initialized" | 94 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
95 | } | 95 | } |
96 | after 100 | 96 | after 100 |
97 | 97 | ||
@@ -99,7 +99,7 @@ spawn $env(SHELL) | |||
99 | send -- "firejail --name=ftest\r" | 99 | send -- "firejail --name=ftest\r" |
100 | expect { | 100 | expect { |
101 | timeout {puts "TESTING ERROR 11\n";exit} | 101 | timeout {puts "TESTING ERROR 11\n";exit} |
102 | "Child process initialized" | 102 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
103 | } | 103 | } |
104 | after 100 | 104 | after 100 |
105 | 105 | ||
diff --git a/test/utils/profile_print.exp b/test/utils/profile_print.exp index d64a4a2ad..9b2d65d84 100755 --- a/test/utils/profile_print.exp +++ b/test/utils/profile_print.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --name=ftest\r" | 11 | send -- "firejail --name=ftest\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 | after 100 | 16 | after 100 |
17 | 17 | ||
diff --git a/test/utils/protocol-print.exp b/test/utils/protocol-print.exp index 2e581a03a..ca74b7fc9 100755 --- a/test/utils/protocol-print.exp +++ b/test/utils/protocol-print.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=test\r" | 10 | send -- "firejail --name=test\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
diff --git a/test/utils/seccomp-print.exp b/test/utils/seccomp-print.exp index 51bbfb874..a9525ce2e 100755 --- a/test/utils/seccomp-print.exp +++ b/test/utils/seccomp-print.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=test\r" | 10 | send -- "firejail --name=test\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
diff --git a/test/utils/shutdown.exp b/test/utils/shutdown.exp index 13580cbdf..3950e901c 100755 --- a/test/utils/shutdown.exp +++ b/test/utils/shutdown.exp | |||
@@ -11,7 +11,7 @@ match_max 100000 | |||
11 | send -- "firejail --name=shutdowntesting\r" | 11 | send -- "firejail --name=shutdowntesting\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 | ||
diff --git a/test/utils/shutdown2.exp b/test/utils/shutdown2.exp index 2ffe2d8ae..4dabf6c23 100755 --- a/test/utils/shutdown2.exp +++ b/test/utils/shutdown2.exp | |||
@@ -12,7 +12,7 @@ set firstspawn $spawn_id | |||
12 | send -- "firejail --name=shutdowntesting ./catchsignal.sh\r" | 12 | send -- "firejail --name=shutdowntesting ./catchsignal.sh\r" |
13 | expect { | 13 | expect { |
14 | timeout {puts "TESTING ERROR 0\n";exit} | 14 | timeout {puts "TESTING ERROR 0\n";exit} |
15 | "Child process initialized" | 15 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
16 | } | 16 | } |
17 | sleep 2 | 17 | sleep 2 |
18 | 18 | ||
diff --git a/test/utils/shutdown3.exp b/test/utils/shutdown3.exp index e96ded14d..8017d753d 100755 --- a/test/utils/shutdown3.exp +++ b/test/utils/shutdown3.exp | |||
@@ -12,7 +12,7 @@ set firstspawn $spawn_id | |||
12 | send -- "firejail --name=shutdowntesting ./catchsignal-master.sh\r" | 12 | send -- "firejail --name=shutdowntesting ./catchsignal-master.sh\r" |
13 | expect { | 13 | expect { |
14 | timeout {puts "TESTING ERROR 0\n";exit} | 14 | timeout {puts "TESTING ERROR 0\n";exit} |
15 | "Child process initialized" | 15 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
16 | } | 16 | } |
17 | sleep 2 | 17 | sleep 2 |
18 | 18 | ||
diff --git a/test/utils/shutdown4.exp b/test/utils/shutdown4.exp index a94cac64b..09db3f140 100755 --- a/test/utils/shutdown4.exp +++ b/test/utils/shutdown4.exp | |||
@@ -12,7 +12,7 @@ set firstspawn $spawn_id | |||
12 | send -- "firejail --name=shutdowntesting ./catchsignal2.sh\r" | 12 | send -- "firejail --name=shutdowntesting ./catchsignal2.sh\r" |
13 | expect { | 13 | expect { |
14 | timeout {puts "TESTING ERROR 0\n";exit} | 14 | timeout {puts "TESTING ERROR 0\n";exit} |
15 | "Child process initialized" | 15 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
16 | } | 16 | } |
17 | sleep 2 | 17 | sleep 2 |
18 | 18 | ||
diff --git a/test/utils/top.exp b/test/utils/top.exp index 515b4ffbf..402d7c2df 100755 --- a/test/utils/top.exp +++ b/test/utils/top.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --name=test1\r" | 10 | send -- "firejail --name=test1\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
@@ -18,7 +18,7 @@ spawn $env(SHELL) | |||
18 | send -- "firejail --name=test2\r" | 18 | send -- "firejail --name=test2\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 1\n";exit} | 20 | timeout {puts "TESTING ERROR 1\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 | ||
diff --git a/test/utils/trace.exp b/test/utils/trace.exp index 890884248..f14001c88 100755 --- a/test/utils/trace.exp +++ b/test/utils/trace.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail --trace mkdir ttt\r" | 10 | send -- "firejail --trace mkdir ttt\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | expect { | 15 | expect { |
16 | timeout {puts "TESTING ERROR 1\n";exit} | 16 | timeout {puts "TESTING ERROR 1\n";exit} |
@@ -21,7 +21,7 @@ sleep 1 | |||
21 | send -- "firejail --trace rmdir ttt\r" | 21 | send -- "firejail --trace rmdir ttt\r" |
22 | expect { | 22 | expect { |
23 | timeout {puts "TESTING ERROR 2\n";exit} | 23 | timeout {puts "TESTING ERROR 2\n";exit} |
24 | "Child process initialized" | 24 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
25 | } | 25 | } |
26 | expect { | 26 | expect { |
27 | timeout {puts "TESTING ERROR 3\n";exit} | 27 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -32,7 +32,7 @@ sleep 1 | |||
32 | send -- "firejail --trace touch ttt\r" | 32 | send -- "firejail --trace touch ttt\r" |
33 | expect { | 33 | expect { |
34 | timeout {puts "TESTING ERROR 4\n";exit} | 34 | timeout {puts "TESTING ERROR 4\n";exit} |
35 | "Child process initialized" | 35 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
36 | } | 36 | } |
37 | expect { | 37 | expect { |
38 | timeout {puts "TESTING ERROR 5\n";exit} | 38 | timeout {puts "TESTING ERROR 5\n";exit} |
@@ -44,7 +44,7 @@ sleep 1 | |||
44 | send -- "firejail --trace rm ttt\r" | 44 | send -- "firejail --trace rm ttt\r" |
45 | expect { | 45 | expect { |
46 | timeout {puts "TESTING ERROR 6\n";exit} | 46 | timeout {puts "TESTING ERROR 6\n";exit} |
47 | "Child process initialized" | 47 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
48 | } | 48 | } |
49 | expect { | 49 | expect { |
50 | timeout {puts "TESTING ERROR 7\n";exit} | 50 | timeout {puts "TESTING ERROR 7\n";exit} |
@@ -55,7 +55,7 @@ sleep 1 | |||
55 | send -- "firejail --trace wget -q debian.org\r" | 55 | send -- "firejail --trace wget -q debian.org\r" |
56 | #expect { | 56 | #expect { |
57 | # timeout {puts "TESTING ERROR 8.1\n";exit} | 57 | # timeout {puts "TESTING ERROR 8.1\n";exit} |
58 | # "Child process initialized" | 58 | # -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
59 | #} | 59 | #} |
60 | #expect { | 60 | #expect { |
61 | # timeout {puts "TESTING ERROR 8.2\n";exit} | 61 | # timeout {puts "TESTING ERROR 8.2\n";exit} |
@@ -86,7 +86,7 @@ sleep 1 | |||
86 | send -- "firejail --trace rm index.html\r" | 86 | send -- "firejail --trace rm index.html\r" |
87 | expect { | 87 | expect { |
88 | timeout {puts "TESTING ERROR 9\n";exit} | 88 | timeout {puts "TESTING ERROR 9\n";exit} |
89 | "Child process initialized" | 89 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
90 | } | 90 | } |
91 | expect { | 91 | expect { |
92 | timeout {puts "TESTING ERROR 10\n";exit} | 92 | timeout {puts "TESTING ERROR 10\n";exit} |
@@ -98,7 +98,7 @@ sleep 1 | |||
98 | send -- "firejail --trace\r" | 98 | send -- "firejail --trace\r" |
99 | expect { | 99 | expect { |
100 | timeout {puts "TESTING ERROR 11\n";exit} | 100 | timeout {puts "TESTING ERROR 11\n";exit} |
101 | "Child process initialized" | 101 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
102 | } | 102 | } |
103 | expect { | 103 | expect { |
104 | timeout {puts "TESTING ERROR 12\n";exit} | 104 | timeout {puts "TESTING ERROR 12\n";exit} |
diff --git a/test/utils/tree.exp b/test/utils/tree.exp index 9cdb09639..4b1f70bd2 100755 --- a/test/utils/tree.exp +++ b/test/utils/tree.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "firejail\r" | 10 | send -- "firejail\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
14 | } | 14 | } |
15 | after 100 | 15 | after 100 |
16 | 16 | ||
@@ -18,7 +18,7 @@ spawn $env(SHELL) | |||
18 | send -- "firejail\r" | 18 | send -- "firejail\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 1\n";exit} | 20 | timeout {puts "TESTING ERROR 1\n";exit} |
21 | "Child process initialized" | 21 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
22 | } | 22 | } |
23 | after 100 | 23 | after 100 |
24 | 24 | ||
@@ -26,7 +26,7 @@ spawn $env(SHELL) | |||
26 | send -- "firejail\r" | 26 | send -- "firejail\r" |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 2\n";exit} | 28 | timeout {puts "TESTING ERROR 2\n";exit} |
29 | "Child process initialized" | 29 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
30 | } | 30 | } |
31 | sleep 1 | 31 | sleep 1 |
32 | 32 | ||