diff options
author | netblue30 <netblue30@yahoo.com> | 2016-04-05 12:08:44 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-04-05 12:08:44 -0400 |
commit | e3a306f51bf6d76c9c8d40deeecb0ec0147624ff (patch) | |
tree | a0fb54c3f72a0939d19d7e988d647cc3db24ee51 /test | |
parent | grsecurity: --overlay (diff) | |
download | firejail-e3a306f51bf6d76c9c8d40deeecb0ec0147624ff.tar.gz firejail-e3a306f51bf6d76c9c8d40deeecb0ec0147624ff.tar.zst firejail-e3a306f51bf6d76c9c8d40deeecb0ec0147624ff.zip |
grsecurity: testing
Diffstat (limited to 'test')
-rwxr-xr-x | test/features/1.1.exp | 3 | ||||
-rwxr-xr-x | test/features/1.10.exp | 3 | ||||
-rwxr-xr-x | test/features/1.2.exp | 3 | ||||
-rwxr-xr-x | test/features/1.4.exp | 3 | ||||
-rwxr-xr-x | test/features/1.5.exp | 3 | ||||
-rwxr-xr-x | test/features/1.6.exp | 3 | ||||
-rwxr-xr-x | test/features/1.7.exp | 3 | ||||
-rwxr-xr-x | test/features/1.8.exp | 3 | ||||
-rwxr-xr-x | test/features/2.1.exp | 3 | ||||
-rwxr-xr-x | test/features/2.2.exp | 3 | ||||
-rwxr-xr-x | test/features/2.3.exp | 3 | ||||
-rwxr-xr-x | test/features/2.4.exp | 3 | ||||
-rwxr-xr-x | test/features/2.5.exp | 3 | ||||
-rwxr-xr-x | test/features/2.6.exp | 21 | ||||
-rwxr-xr-x | test/features/3.1.exp | 3 | ||||
-rwxr-xr-x | test/features/3.10.exp | 3 | ||||
-rwxr-xr-x | test/features/3.11.exp | 3 | ||||
-rwxr-xr-x | test/features/3.2.exp | 3 | ||||
-rwxr-xr-x | test/features/3.3.exp | 3 | ||||
-rwxr-xr-x | test/features/3.4.exp | 3 | ||||
-rwxr-xr-x | test/features/3.5.exp | 3 | ||||
-rwxr-xr-x | test/features/3.6.exp | 3 | ||||
-rwxr-xr-x | test/features/3.7.exp | 3 | ||||
-rwxr-xr-x | test/features/3.8.exp | 3 | ||||
-rwxr-xr-x | test/features/3.9.exp | 3 | ||||
-rwxr-xr-x | test/invalid_filename.exp | 2 | ||||
-rwxr-xr-x | test/option_chroot_overlay.exp | 2 |
27 files changed, 61 insertions, 36 deletions
diff --git a/test/features/1.1.exp b/test/features/1.1.exp index 0d02b54c1..804b73135 100755 --- a/test/features/1.1.exp +++ b/test/features/1.1.exp | |||
@@ -36,7 +36,8 @@ if { $overlay == "overlay" } { | |||
36 | send -- "firejail --noprofile --overlay\r" | 36 | send -- "firejail --noprofile --overlay\r" |
37 | expect { | 37 | expect { |
38 | timeout {puts "TESTING ERROR 2\n";exit} | 38 | timeout {puts "TESTING ERROR 2\n";exit} |
39 | "Child process initialized" | 39 | "overlay option is not available" {puts "grsecurity\n"; exit} |
40 | "Child process initialized" {puts "normal system\n"} | ||
40 | } | 41 | } |
41 | sleep 1 | 42 | sleep 1 |
42 | 43 | ||
diff --git a/test/features/1.10.exp b/test/features/1.10.exp index d9ed8cc6e..e7d51007c 100755 --- a/test/features/1.10.exp +++ b/test/features/1.10.exp | |||
@@ -37,7 +37,8 @@ if { $overlay == "overlay" } { | |||
37 | send -- "firejail --noprofile --overlay\r" | 37 | send -- "firejail --noprofile --overlay\r" |
38 | expect { | 38 | expect { |
39 | timeout {puts "TESTING ERROR 2\n";exit} | 39 | timeout {puts "TESTING ERROR 2\n";exit} |
40 | "Child process initialized" | 40 | "overlay option is not available" {puts "grsecurity\n"; exit} |
41 | "Child process initialized" {puts "normal system\n"} | ||
41 | } | 42 | } |
42 | sleep 1 | 43 | sleep 1 |
43 | 44 | ||
diff --git a/test/features/1.2.exp b/test/features/1.2.exp index 65fcd54ae..6f7cae888 100755 --- a/test/features/1.2.exp +++ b/test/features/1.2.exp | |||
@@ -60,7 +60,8 @@ if { $overlay == "overlay" } { | |||
60 | send -- "firejail --noprofile --overlay\r" | 60 | send -- "firejail --noprofile --overlay\r" |
61 | expect { | 61 | expect { |
62 | timeout {puts "TESTING ERROR 2\n";exit} | 62 | timeout {puts "TESTING ERROR 2\n";exit} |
63 | "Child process initialized" | 63 | "overlay option is not available" {puts "grsecurity\n"; exit} |
64 | "Child process initialized" {puts "normal system\n"} | ||
64 | } | 65 | } |
65 | sleep 1 | 66 | sleep 1 |
66 | 67 | ||
diff --git a/test/features/1.4.exp b/test/features/1.4.exp index 1c626518b..d6f373e2a 100755 --- a/test/features/1.4.exp +++ b/test/features/1.4.exp | |||
@@ -49,7 +49,8 @@ if { $overlay == "overlay" } { | |||
49 | send -- "firejail --noprofile --overlay\r" | 49 | send -- "firejail --noprofile --overlay\r" |
50 | expect { | 50 | expect { |
51 | timeout {puts "TESTING ERROR 2\n";exit} | 51 | timeout {puts "TESTING ERROR 2\n";exit} |
52 | "Child process initialized" | 52 | "overlay option is not available" {puts "grsecurity\n"; exit} |
53 | "Child process initialized" {puts "normal system\n"} | ||
53 | } | 54 | } |
54 | sleep 1 | 55 | sleep 1 |
55 | 56 | ||
diff --git a/test/features/1.5.exp b/test/features/1.5.exp index 56530f3f4..a17504e74 100755 --- a/test/features/1.5.exp +++ b/test/features/1.5.exp | |||
@@ -36,7 +36,8 @@ if { $overlay == "overlay" } { | |||
36 | send -- "firejail --noprofile --overlay\r" | 36 | send -- "firejail --noprofile --overlay\r" |
37 | expect { | 37 | expect { |
38 | timeout {puts "TESTING ERROR 2\n";exit} | 38 | timeout {puts "TESTING ERROR 2\n";exit} |
39 | "Child process initialized" | 39 | "overlay option is not available" {puts "grsecurity\n"; exit} |
40 | "Child process initialized" {puts "normal system\n"} | ||
40 | } | 41 | } |
41 | sleep 1 | 42 | sleep 1 |
42 | 43 | ||
diff --git a/test/features/1.6.exp b/test/features/1.6.exp index e8ab456e4..0db929c5a 100755 --- a/test/features/1.6.exp +++ b/test/features/1.6.exp | |||
@@ -36,7 +36,8 @@ if { $overlay == "overlay" } { | |||
36 | send -- "firejail --noprofile --overlay\r" | 36 | send -- "firejail --noprofile --overlay\r" |
37 | expect { | 37 | expect { |
38 | timeout {puts "TESTING ERROR 2\n";exit} | 38 | timeout {puts "TESTING ERROR 2\n";exit} |
39 | "Child process initialized" | 39 | "overlay option is not available" {puts "grsecurity\n"; exit} |
40 | "Child process initialized" {puts "normal system\n"} | ||
40 | } | 41 | } |
41 | sleep 1 | 42 | sleep 1 |
42 | 43 | ||
diff --git a/test/features/1.7.exp b/test/features/1.7.exp index 2b79ea6be..b838c092f 100755 --- a/test/features/1.7.exp +++ b/test/features/1.7.exp | |||
@@ -38,7 +38,8 @@ if { $overlay == "overlay" } { | |||
38 | send -- "firejail --noprofile --overlay\r" | 38 | send -- "firejail --noprofile --overlay\r" |
39 | expect { | 39 | expect { |
40 | timeout {puts "TESTING ERROR 2\n";exit} | 40 | timeout {puts "TESTING ERROR 2\n";exit} |
41 | "Child process initialized" | 41 | "overlay option is not available" {puts "grsecurity\n"; exit} |
42 | "Child process initialized" {puts "normal system\n"} | ||
42 | } | 43 | } |
43 | sleep 1 | 44 | sleep 1 |
44 | 45 | ||
diff --git a/test/features/1.8.exp b/test/features/1.8.exp index dd525df49..493a87328 100755 --- a/test/features/1.8.exp +++ b/test/features/1.8.exp | |||
@@ -73,7 +73,8 @@ if { $overlay == "overlay" } { | |||
73 | send -- "firejail --noprofile --overlay\r" | 73 | send -- "firejail --noprofile --overlay\r" |
74 | expect { | 74 | expect { |
75 | timeout {puts "TESTING ERROR 2\n";exit} | 75 | timeout {puts "TESTING ERROR 2\n";exit} |
76 | "Child process initialized" | 76 | "overlay option is not available" {puts "grsecurity\n"; exit} |
77 | "Child process initialized" {puts "normal system\n"} | ||
77 | } | 78 | } |
78 | sleep 1 | 79 | sleep 1 |
79 | send -- "ls /etc/firejail\r" | 80 | send -- "ls /etc/firejail\r" |
diff --git a/test/features/2.1.exp b/test/features/2.1.exp index 07d6a9820..074b5989b 100755 --- a/test/features/2.1.exp +++ b/test/features/2.1.exp | |||
@@ -52,7 +52,8 @@ if { $overlay == "overlay" } { | |||
52 | send -- "firejail --noprofile --hostname=bingo --overlay\r" | 52 | send -- "firejail --noprofile --hostname=bingo --overlay\r" |
53 | expect { | 53 | expect { |
54 | timeout {puts "TESTING ERROR 2\n";exit} | 54 | timeout {puts "TESTING ERROR 2\n";exit} |
55 | "Child process initialized" | 55 | "overlay option is not available" {puts "grsecurity\n"; exit} |
56 | "Child process initialized" {puts "normal system\n"} | ||
56 | } | 57 | } |
57 | sleep 1 | 58 | sleep 1 |
58 | 59 | ||
diff --git a/test/features/2.2.exp b/test/features/2.2.exp index 9e3878a4d..f30ccaf79 100755 --- a/test/features/2.2.exp +++ b/test/features/2.2.exp | |||
@@ -44,7 +44,8 @@ if { $overlay == "overlay" } { | |||
44 | send -- "firejail --noprofile --dns=4.2.2.1 --overlay\r" | 44 | send -- "firejail --noprofile --dns=4.2.2.1 --overlay\r" |
45 | expect { | 45 | expect { |
46 | timeout {puts "TESTING ERROR 2\n";exit} | 46 | timeout {puts "TESTING ERROR 2\n";exit} |
47 | "Child process initialized" | 47 | "overlay option is not available" {puts "grsecurity\n"; exit} |
48 | "Child process initialized" {puts "normal system\n"} | ||
48 | } | 49 | } |
49 | sleep 1 | 50 | sleep 1 |
50 | 51 | ||
diff --git a/test/features/2.3.exp b/test/features/2.3.exp index 1363e41b6..63caab14c 100755 --- a/test/features/2.3.exp +++ b/test/features/2.3.exp | |||
@@ -107,7 +107,8 @@ if { $overlay == "overlay" } { | |||
107 | send -- "firejail --noprofile --net=eth0 --overlay --dns=8.8.8.8 --dns=8.8.4.4\r" | 107 | send -- "firejail --noprofile --net=eth0 --overlay --dns=8.8.8.8 --dns=8.8.4.4\r" |
108 | expect { | 108 | expect { |
109 | timeout {puts "TESTING ERROR 2\n";exit} | 109 | timeout {puts "TESTING ERROR 2\n";exit} |
110 | "Child process initialized" | 110 | "overlay option is not available" {puts "grsecurity\n"; exit} |
111 | "Child process initialized" {puts "normal system\n"} | ||
111 | } | 112 | } |
112 | sleep 1 | 113 | sleep 1 |
113 | 114 | ||
diff --git a/test/features/2.4.exp b/test/features/2.4.exp index 0c4808a1a..fed596410 100755 --- a/test/features/2.4.exp +++ b/test/features/2.4.exp | |||
@@ -95,7 +95,8 @@ if { $overlay == "overlay" } { | |||
95 | send -- "firejail --noprofile --net=br0 --overlay\r" | 95 | send -- "firejail --noprofile --net=br0 --overlay\r" |
96 | expect { | 96 | expect { |
97 | timeout {puts "TESTING ERROR 2\n";exit} | 97 | timeout {puts "TESTING ERROR 2\n";exit} |
98 | "Child process initialized" | 98 | "overlay option is not available" {puts "grsecurity\n"; exit} |
99 | "Child process initialized" {puts "normal system\n"} | ||
99 | } | 100 | } |
100 | sleep 1 | 101 | sleep 1 |
101 | 102 | ||
diff --git a/test/features/2.5.exp b/test/features/2.5.exp index a3a330643..1d6105ae8 100755 --- a/test/features/2.5.exp +++ b/test/features/2.5.exp | |||
@@ -47,7 +47,8 @@ if { $overlay == "overlay" } { | |||
47 | send -- "firejail --noprofile --overlay --interface=eth0.6\r" | 47 | send -- "firejail --noprofile --overlay --interface=eth0.6\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 | "overlay option is not available" {puts "grsecurity\n"; exit} |
51 | "Child process initialized" {puts "normal system\n"} | ||
51 | } | 52 | } |
52 | sleep 1 | 53 | sleep 1 |
53 | 54 | ||
diff --git a/test/features/2.6.exp b/test/features/2.6.exp index f3eea2fd6..596e8f435 100755 --- a/test/features/2.6.exp +++ b/test/features/2.6.exp | |||
@@ -12,17 +12,17 @@ set chroot [lindex $argv 1] | |||
12 | # | 12 | # |
13 | # N | 13 | # N |
14 | # | 14 | # |
15 | send -- "firejail --noprofile --net=eth0 --defaultgw=192.168.1.10\r" | 15 | send -- "firejail --noprofile --net=eth0 --defaultgw=192.168.1.10 --protocol=unix,inet,netlink\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 | "Child process initialized" |
19 | } | 19 | } |
20 | sleep 1 | 20 | sleep 1 |
21 | 21 | ||
22 | send -- "netstat -rn\r" | 22 | send -- "ip route show\r" |
23 | expect { | 23 | expect { |
24 | timeout {puts "TESTING ERROR 1\n";exit} | 24 | timeout {puts "TESTING ERROR 1\n";exit} |
25 | "0.0.0.0 192.168.1.10" | 25 | "default via 192.168.1.10 dev eth0" |
26 | } | 26 | } |
27 | after 100 | 27 | after 100 |
28 | send -- "exit\r" | 28 | send -- "exit\r" |
@@ -32,17 +32,18 @@ sleep 1 | |||
32 | # O | 32 | # O |
33 | # | 33 | # |
34 | if { $overlay == "overlay" } { | 34 | if { $overlay == "overlay" } { |
35 | send -- "firejail --noprofile --overlay --net=eth0 --defaultgw=192.168.1.10\r" | 35 | send -- "firejail --noprofile --overlay --net=eth0 --defaultgw=192.168.1.10 --protocol=unix,inet,netlink\r" |
36 | expect { | 36 | expect { |
37 | timeout {puts "TESTING ERROR 2\n";exit} | 37 | timeout {puts "TESTING ERROR 2\n";exit} |
38 | "Child process initialized" | 38 | "overlay option is not available" {puts "grsecurity\n"; exit} |
39 | "Child process initialized" {puts "normal system\n"} | ||
39 | } | 40 | } |
40 | sleep 1 | 41 | sleep 1 |
41 | 42 | ||
42 | send -- "netstat -rn\r" | 43 | send -- "ip route show\r" |
43 | expect { | 44 | expect { |
44 | timeout {puts "TESTING ERROR 3\n";exit} | 45 | timeout {puts "TESTING ERROR 3\n";exit} |
45 | "0.0.0.0 192.168.1.10" | 46 | "default via 192.168.1.10 dev eth0" |
46 | } | 47 | } |
47 | after 100 | 48 | after 100 |
48 | send -- "exit\r" | 49 | send -- "exit\r" |
@@ -53,17 +54,17 @@ if { $overlay == "overlay" } { | |||
53 | # C | 54 | # C |
54 | # | 55 | # |
55 | if { $chroot == "chroot" } { | 56 | if { $chroot == "chroot" } { |
56 | send -- "firejail --noprofile --chroot=/tmp/chroot --net=eth0 --defaultgw=192.168.1.10\r" | 57 | send -- "firejail --noprofile --chroot=/tmp/chroot --net=eth0 --defaultgw=192.168.1.10 --protocol=unix,inet,netlink\r" |
57 | expect { | 58 | expect { |
58 | timeout {puts "TESTING ERROR 4\n";exit} | 59 | timeout {puts "TESTING ERROR 4\n";exit} |
59 | "Child process initialized" | 60 | "Child process initialized" |
60 | } | 61 | } |
61 | sleep 1 | 62 | sleep 1 |
62 | 63 | ||
63 | send -- "netstat -rn\r" | 64 | send -- "ip route show\r" |
64 | expect { | 65 | expect { |
65 | timeout {puts "TESTING ERROR 5\n";exit} | 66 | timeout {puts "TESTING ERROR 5\n";exit} |
66 | "0.0.0.0 192.168.1.10" | 67 | "default via 192.168.1.10 dev eth0" |
67 | } | 68 | } |
68 | after 100 | 69 | after 100 |
69 | send -- "exit\r" | 70 | send -- "exit\r" |
diff --git a/test/features/3.1.exp b/test/features/3.1.exp index c55f3aa8a..046c703b7 100755 --- a/test/features/3.1.exp +++ b/test/features/3.1.exp | |||
@@ -66,7 +66,8 @@ if { $overlay == "overlay" } { | |||
66 | send -- "firejail --noprofile --overlay --private\r" | 66 | send -- "firejail --noprofile --overlay --private\r" |
67 | expect { | 67 | expect { |
68 | timeout {puts "TESTING ERROR 2\n";exit} | 68 | timeout {puts "TESTING ERROR 2\n";exit} |
69 | "Child process initialized" | 69 | "overlay option is not available" {puts "grsecurity\n"; exit} |
70 | "Child process initialized" {puts "normal system\n"} | ||
70 | } | 71 | } |
71 | sleep 1 | 72 | sleep 1 |
72 | 73 | ||
diff --git a/test/features/3.10.exp b/test/features/3.10.exp index 47da7f1c2..4a06463a7 100755 --- a/test/features/3.10.exp +++ b/test/features/3.10.exp | |||
@@ -74,7 +74,8 @@ if { $overlay == "overlay" } { | |||
74 | send -- "firejail --noprofile --overlay --whitelist=/tmp/test1dir\r" | 74 | send -- "firejail --noprofile --overlay --whitelist=/tmp/test1dir\r" |
75 | expect { | 75 | expect { |
76 | timeout {puts "TESTING ERROR 2\n";exit} | 76 | timeout {puts "TESTING ERROR 2\n";exit} |
77 | "Child process initialized" | 77 | "overlay option is not available" {puts "grsecurity\n"; exit} |
78 | "Child process initialized" {puts "normal system\n"} | ||
78 | } | 79 | } |
79 | sleep 1 | 80 | sleep 1 |
80 | 81 | ||
diff --git a/test/features/3.11.exp b/test/features/3.11.exp index 3a5e38257..dc41ed743 100755 --- a/test/features/3.11.exp +++ b/test/features/3.11.exp | |||
@@ -69,7 +69,8 @@ if { $overlay == "overlay" } { | |||
69 | send -- "firejail --profile=3.11.profile\r" | 69 | send -- "firejail --profile=3.11.profile\r" |
70 | expect { | 70 | expect { |
71 | timeout {puts "TESTING ERROR 10\n";exit} | 71 | timeout {puts "TESTING ERROR 10\n";exit} |
72 | "Child process initialized" | 72 | "overlay option is not available" {puts "grsecurity\n"; exit} |
73 | "Child process initialized" {puts "normal system\n"} | ||
73 | } | 74 | } |
74 | sleep 1 | 75 | sleep 1 |
75 | 76 | ||
diff --git a/test/features/3.2.exp b/test/features/3.2.exp index 6f743c414..be20b1547 100755 --- a/test/features/3.2.exp +++ b/test/features/3.2.exp | |||
@@ -37,7 +37,8 @@ if { $overlay == "overlay" } { | |||
37 | send -- "firejail --noprofile --overlay --read-only=/home/netblue/.config\r" | 37 | send -- "firejail --noprofile --overlay --read-only=/home/netblue/.config\r" |
38 | expect { | 38 | expect { |
39 | timeout {puts "TESTING ERROR 2\n";exit} | 39 | timeout {puts "TESTING ERROR 2\n";exit} |
40 | "Child process initialized" | 40 | "overlay option is not available" {puts "grsecurity\n"; exit} |
41 | "Child process initialized" {puts "normal system\n"} | ||
41 | } | 42 | } |
42 | sleep 1 | 43 | sleep 1 |
43 | 44 | ||
diff --git a/test/features/3.3.exp b/test/features/3.3.exp index 74260cad3..bb2c34dc1 100755 --- a/test/features/3.3.exp +++ b/test/features/3.3.exp | |||
@@ -36,7 +36,8 @@ if { $overlay == "overlay" } { | |||
36 | send -- "firejail --noprofile --overlay --blacklist=/home/netblue/.config\r" | 36 | send -- "firejail --noprofile --overlay --blacklist=/home/netblue/.config\r" |
37 | expect { | 37 | expect { |
38 | timeout {puts "TESTING ERROR 2\n";exit} | 38 | timeout {puts "TESTING ERROR 2\n";exit} |
39 | "Child process initialized" | 39 | "overlay option is not available" {puts "grsecurity\n"; exit} |
40 | "Child process initialized" {puts "normal system\n"} | ||
40 | } | 41 | } |
41 | sleep 1 | 42 | sleep 1 |
42 | 43 | ||
diff --git a/test/features/3.4.exp b/test/features/3.4.exp index 3f316af5b..7ed439669 100755 --- a/test/features/3.4.exp +++ b/test/features/3.4.exp | |||
@@ -79,7 +79,8 @@ if { $overlay == "overlay" } { | |||
79 | send -- "firejail --noprofile --overlay --whitelist=/home/netblue/.config\r" | 79 | send -- "firejail --noprofile --overlay --whitelist=/home/netblue/.config\r" |
80 | expect { | 80 | expect { |
81 | timeout {puts "TESTING ERROR 2\n";exit} | 81 | timeout {puts "TESTING ERROR 2\n";exit} |
82 | "Child process initialized" | 82 | "overlay option is not available" {puts "grsecurity\n"; exit} |
83 | "Child process initialized" {puts "normal system\n"} | ||
83 | } | 84 | } |
84 | sleep 1 | 85 | sleep 1 |
85 | 86 | ||
diff --git a/test/features/3.5.exp b/test/features/3.5.exp index b1a16830d..aed5fe836 100755 --- a/test/features/3.5.exp +++ b/test/features/3.5.exp | |||
@@ -37,7 +37,8 @@ if { $overlay == "overlay" } { | |||
37 | send -- "firejail --noprofile --overlay --private-dev\r" | 37 | send -- "firejail --noprofile --overlay --private-dev\r" |
38 | expect { | 38 | expect { |
39 | timeout {puts "TESTING ERROR 2\n";exit} | 39 | timeout {puts "TESTING ERROR 2\n";exit} |
40 | "Child process initialized" | 40 | "overlay option is not available" {puts "grsecurity\n"; exit} |
41 | "Child process initialized" {puts "normal system\n"} | ||
41 | } | 42 | } |
42 | sleep 1 | 43 | sleep 1 |
43 | 44 | ||
diff --git a/test/features/3.6.exp b/test/features/3.6.exp index 6117485da..fbb3986a0 100755 --- a/test/features/3.6.exp +++ b/test/features/3.6.exp | |||
@@ -36,7 +36,8 @@ if { $overlay == "overlay" } { | |||
36 | send -- "firejail --noprofile --overlay --private-etc=group,hostname,hosts,nsswitch.conf,passwd,resolv.conf,skel\r" | 36 | send -- "firejail --noprofile --overlay --private-etc=group,hostname,hosts,nsswitch.conf,passwd,resolv.conf,skel\r" |
37 | expect { | 37 | expect { |
38 | timeout {puts "TESTING ERROR 2\n";exit} | 38 | timeout {puts "TESTING ERROR 2\n";exit} |
39 | "Child process initialized" | 39 | "overlay option is not available" {puts "grsecurity\n"; exit} |
40 | "Child process initialized" {puts "normal system\n"} | ||
40 | } | 41 | } |
41 | sleep 1 | 42 | sleep 1 |
42 | 43 | ||
diff --git a/test/features/3.7.exp b/test/features/3.7.exp index d8236b851..2a9ce84d6 100755 --- a/test/features/3.7.exp +++ b/test/features/3.7.exp | |||
@@ -45,7 +45,8 @@ if { $overlay == "overlay" } { | |||
45 | send -- "firejail --noprofile --overlay --private-tmp\r" | 45 | send -- "firejail --noprofile --overlay --private-tmp\r" |
46 | expect { | 46 | expect { |
47 | timeout {puts "TESTING ERROR 2\n";exit} | 47 | timeout {puts "TESTING ERROR 2\n";exit} |
48 | "Child process initialized" | 48 | "overlay option is not available" {puts "grsecurity\n"; exit} |
49 | "Child process initialized" {puts "normal system\n"} | ||
49 | } | 50 | } |
50 | sleep 1 | 51 | sleep 1 |
51 | 52 | ||
diff --git a/test/features/3.8.exp b/test/features/3.8.exp index 2405e4fdb..94a1abf67 100755 --- a/test/features/3.8.exp +++ b/test/features/3.8.exp | |||
@@ -37,7 +37,8 @@ if { $overlay == "overlay" } { | |||
37 | send -- "firejail --noprofile --overlay --private-bin=bash,cat,cp,ls,wc\r" | 37 | send -- "firejail --noprofile --overlay --private-bin=bash,cat,cp,ls,wc\r" |
38 | expect { | 38 | expect { |
39 | timeout {puts "TESTING ERROR 2\n";exit} | 39 | timeout {puts "TESTING ERROR 2\n";exit} |
40 | "Child process initialized" | 40 | "overlay option is not available" {puts "grsecurity\n"; exit} |
41 | "Child process initialized" {puts "normal system\n"} | ||
41 | } | 42 | } |
42 | sleep 1 | 43 | sleep 1 |
43 | 44 | ||
diff --git a/test/features/3.9.exp b/test/features/3.9.exp index a1797804f..660ccbe05 100755 --- a/test/features/3.9.exp +++ b/test/features/3.9.exp | |||
@@ -38,7 +38,8 @@ if { $overlay == "overlay" } { | |||
38 | send -- "firejail --noprofile --overlay --whitelist=/dev/tty --whitelist=/dev/null\r" | 38 | send -- "firejail --noprofile --overlay --whitelist=/dev/tty --whitelist=/dev/null\r" |
39 | expect { | 39 | expect { |
40 | timeout {puts "TESTING ERROR 2\n";exit} | 40 | timeout {puts "TESTING ERROR 2\n";exit} |
41 | "Child process initialized" | 41 | "overlay option is not available" {puts "grsecurity\n"; exit} |
42 | "Child process initialized" {puts "normal system\n"} | ||
42 | } | 43 | } |
43 | sleep 1 | 44 | sleep 1 |
44 | 45 | ||
diff --git a/test/invalid_filename.exp b/test/invalid_filename.exp index 8b8087e9b..fe8bd8c25 100755 --- a/test/invalid_filename.exp +++ b/test/invalid_filename.exp | |||
@@ -57,7 +57,7 @@ send -- "firejail --debug-check-filename --noprofile --chroot=\"bla&&bla\"\r" | |||
57 | expect { | 57 | expect { |
58 | timeout {puts "TESTING ERROR 3.1\n";exit} | 58 | timeout {puts "TESTING ERROR 3.1\n";exit} |
59 | "Checking filename bla&&bla" {puts "normal system\n"} | 59 | "Checking filename bla&&bla" {puts "normal system\n"} |
60 | "Error: --chroot option is not available on GRSecurity systems" { puts "\nall done\n"; exit} | 60 | "Error: --chroot option is not available on Grsecurity systems" { puts "\nall done\n"; exit} |
61 | } | 61 | } |
62 | expect { | 62 | expect { |
63 | timeout {puts "TESTING ERROR 3.2\n";exit} | 63 | timeout {puts "TESTING ERROR 3.2\n";exit} |
diff --git a/test/option_chroot_overlay.exp b/test/option_chroot_overlay.exp index dd1b8eb28..08ffb1b43 100755 --- a/test/option_chroot_overlay.exp +++ b/test/option_chroot_overlay.exp | |||
@@ -8,7 +8,7 @@ send -- "firejail --chroot=/tmp/chroot --overlay\r" | |||
8 | expect { | 8 | expect { |
9 | timeout {puts "TESTING ERROR 0\n";exit} | 9 | timeout {puts "TESTING ERROR 0\n";exit} |
10 | "mutually exclusive" {puts "normal system\n"} | 10 | "mutually exclusive" {puts "normal system\n"} |
11 | "Error: --chroot option is not available on GRSecurity systems" { puts "\nall done\n"; exit} | 11 | "Error: --chroot option is not available on Grsecurity systems" { puts "\nall done\n"; exit} |
12 | } | 12 | } |
13 | sleep 1 | 13 | sleep 1 |
14 | 14 | ||