diff options
author | Fred Barclay <Fred-Barclay@users.noreply.github.com> | 2017-05-24 14:38:01 -0500 |
---|---|---|
committer | Fred Barclay <Fred-Barclay@users.noreply.github.com> | 2017-05-24 14:38:01 -0500 |
commit | 997a93efbdcbbaeed517e0bdc5283e9d8b31f422 (patch) | |
tree | cbb47fb1b41ced351501686e3fdf9aaf46b31414 /test/features | |
parent | Remove trailing whitespace from platform (diff) | |
download | firejail-997a93efbdcbbaeed517e0bdc5283e9d8b31f422.tar.gz firejail-997a93efbdcbbaeed517e0bdc5283e9d8b31f422.tar.zst firejail-997a93efbdcbbaeed517e0bdc5283e9d8b31f422.zip |
strip trailing whitespace from test/
Diffstat (limited to 'test/features')
-rwxr-xr-x | test/features/1.1.exp | 4 | ||||
-rwxr-xr-x | test/features/1.10.exp | 4 | ||||
-rwxr-xr-x | test/features/1.2.exp | 4 | ||||
-rwxr-xr-x | test/features/1.4.exp | 4 | ||||
-rwxr-xr-x | test/features/1.5.exp | 4 | ||||
-rwxr-xr-x | test/features/1.6.exp | 4 | ||||
-rwxr-xr-x | test/features/1.7.exp | 4 | ||||
-rwxr-xr-x | test/features/1.8.exp | 2 | ||||
-rwxr-xr-x | test/features/2.1.exp | 4 | ||||
-rwxr-xr-x | test/features/2.2.exp | 4 | ||||
-rwxr-xr-x | test/features/2.3.exp | 28 | ||||
-rwxr-xr-x | test/features/2.4.exp | 28 | ||||
-rwxr-xr-x | test/features/2.5.exp | 4 | ||||
-rwxr-xr-x | test/features/2.6.exp | 4 | ||||
-rwxr-xr-x | test/features/3.1.exp | 14 | ||||
-rwxr-xr-x | test/features/3.10.exp | 10 | ||||
-rwxr-xr-x | test/features/3.11.exp | 17 | ||||
-rwxr-xr-x | test/features/3.2.exp | 4 | ||||
-rwxr-xr-x | test/features/3.3.exp | 4 | ||||
-rwxr-xr-x | test/features/3.4.exp | 12 | ||||
-rwxr-xr-x | test/features/3.5.exp | 8 | ||||
-rwxr-xr-x | test/features/3.6.exp | 8 | ||||
-rwxr-xr-x | test/features/3.7.exp | 8 | ||||
-rwxr-xr-x | test/features/3.8.exp | 8 | ||||
-rwxr-xr-x | test/features/3.9.exp | 8 | ||||
-rw-r--r-- | test/features/features.txt | 4 | ||||
-rwxr-xr-x | test/features/test.sh | 1 |
27 files changed, 101 insertions, 107 deletions
diff --git a/test/features/1.1.exp b/test/features/1.1.exp index 804b73135..2273a3b98 100755 --- a/test/features/1.1.exp +++ b/test/features/1.1.exp | |||
@@ -40,7 +40,7 @@ if { $overlay == "overlay" } { | |||
40 | "Child process initialized" {puts "normal system\n"} | 40 | "Child process initialized" {puts "normal system\n"} |
41 | } | 41 | } |
42 | sleep 1 | 42 | sleep 1 |
43 | 43 | ||
44 | send -- "ls -l /boot\r" | 44 | send -- "ls -l /boot\r" |
45 | expect { | 45 | expect { |
46 | timeout {puts "TESTING ERROR 3\n";exit} | 46 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -61,7 +61,7 @@ if { $chroot == "chroot" } { | |||
61 | "Child process initialized" | 61 | "Child process initialized" |
62 | } | 62 | } |
63 | sleep 1 | 63 | sleep 1 |
64 | 64 | ||
65 | send -- "ls -l /boot\r" | 65 | send -- "ls -l /boot\r" |
66 | expect { | 66 | expect { |
67 | timeout {puts "TESTING ERROR 5\n";exit} | 67 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/1.10.exp b/test/features/1.10.exp index e7d51007c..b668f5cd1 100755 --- a/test/features/1.10.exp +++ b/test/features/1.10.exp | |||
@@ -41,7 +41,7 @@ if { $overlay == "overlay" } { | |||
41 | "Child process initialized" {puts "normal system\n"} | 41 | "Child process initialized" {puts "normal system\n"} |
42 | } | 42 | } |
43 | sleep 1 | 43 | sleep 1 |
44 | 44 | ||
45 | send -- "ls -l /selinux\r" | 45 | send -- "ls -l /selinux\r" |
46 | expect { | 46 | expect { |
47 | timeout {puts "TESTING ERROR 3\n";exit} | 47 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -63,7 +63,7 @@ if { $chroot == "chroot" } { | |||
63 | "Child process initialized" | 63 | "Child process initialized" |
64 | } | 64 | } |
65 | sleep 1 | 65 | sleep 1 |
66 | 66 | ||
67 | send -- "ls -l /selinux\r" | 67 | send -- "ls -l /selinux\r" |
68 | expect { | 68 | expect { |
69 | timeout {puts "TESTING ERROR 5\n";exit} | 69 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/1.2.exp b/test/features/1.2.exp index bcb227304..81f9531cb 100755 --- a/test/features/1.2.exp +++ b/test/features/1.2.exp | |||
@@ -64,7 +64,7 @@ if { $overlay == "overlay" } { | |||
64 | "Child process initialized" {puts "normal system\n"} | 64 | "Child process initialized" {puts "normal system\n"} |
65 | } | 65 | } |
66 | sleep 1 | 66 | sleep 1 |
67 | 67 | ||
68 | send -- "cat /proc/mounts | grep proc --color=never\r" | 68 | send -- "cat /proc/mounts | grep proc --color=never\r" |
69 | expect { | 69 | expect { |
70 | timeout {puts "TESTING ERROR 3.1\n";exit} | 70 | timeout {puts "TESTING ERROR 3.1\n";exit} |
@@ -105,7 +105,7 @@ if { $chroot == "chroot" } { | |||
105 | "Child process initialized" | 105 | "Child process initialized" |
106 | } | 106 | } |
107 | sleep 1 | 107 | sleep 1 |
108 | 108 | ||
109 | send -- "cat /proc/mounts | grep proc --color=never\r" | 109 | send -- "cat /proc/mounts | grep proc --color=never\r" |
110 | expect { | 110 | expect { |
111 | timeout {puts "TESTING ERROR 5.1\n";exit} | 111 | timeout {puts "TESTING ERROR 5.1\n";exit} |
diff --git a/test/features/1.4.exp b/test/features/1.4.exp index d6f373e2a..de05536f0 100755 --- a/test/features/1.4.exp +++ b/test/features/1.4.exp | |||
@@ -53,7 +53,7 @@ if { $overlay == "overlay" } { | |||
53 | "Child process initialized" {puts "normal system\n"} | 53 | "Child process initialized" {puts "normal system\n"} |
54 | } | 54 | } |
55 | sleep 1 | 55 | sleep 1 |
56 | 56 | ||
57 | send -- "ls -l /home | wc -l\r" | 57 | send -- "ls -l /home | wc -l\r" |
58 | expect { | 58 | expect { |
59 | timeout {puts "TESTING ERROR 3\n";exit} | 59 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -86,7 +86,7 @@ if { $chroot == "chroot" } { | |||
86 | "Child process initialized" | 86 | "Child process initialized" |
87 | } | 87 | } |
88 | sleep 1 | 88 | sleep 1 |
89 | 89 | ||
90 | send -- "ls -l /home | wc -l\r" | 90 | send -- "ls -l /home | wc -l\r" |
91 | expect { | 91 | expect { |
92 | timeout {puts "TESTING ERROR 5\n";exit} | 92 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/1.5.exp b/test/features/1.5.exp index a17504e74..194c7859e 100755 --- a/test/features/1.5.exp +++ b/test/features/1.5.exp | |||
@@ -40,7 +40,7 @@ if { $overlay == "overlay" } { | |||
40 | "Child process initialized" {puts "normal system\n"} | 40 | "Child process initialized" {puts "normal system\n"} |
41 | } | 41 | } |
42 | sleep 1 | 42 | sleep 1 |
43 | 43 | ||
44 | send -- "ps aux | wc -l \r" | 44 | send -- "ps aux | wc -l \r" |
45 | expect { | 45 | expect { |
46 | timeout {puts "TESTING ERROR 3\n";exit} | 46 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -61,7 +61,7 @@ if { $chroot == "chroot" } { | |||
61 | "Child process initialized" | 61 | "Child process initialized" |
62 | } | 62 | } |
63 | sleep 1 | 63 | sleep 1 |
64 | 64 | ||
65 | send -- "ps aux | wc -l \r" | 65 | send -- "ps aux | wc -l \r" |
66 | expect { | 66 | expect { |
67 | timeout {puts "TESTING ERROR 5\n";exit} | 67 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/1.6.exp b/test/features/1.6.exp index 0db929c5a..111aca3c8 100755 --- a/test/features/1.6.exp +++ b/test/features/1.6.exp | |||
@@ -40,7 +40,7 @@ if { $overlay == "overlay" } { | |||
40 | "Child process initialized" {puts "normal system\n"} | 40 | "Child process initialized" {puts "normal system\n"} |
41 | } | 41 | } |
42 | sleep 1 | 42 | sleep 1 |
43 | 43 | ||
44 | send -- "ls -l /var/log/syslog | wc -l\r" | 44 | send -- "ls -l /var/log/syslog | wc -l\r" |
45 | expect { | 45 | expect { |
46 | timeout {puts "TESTING ERROR 3\n";exit} | 46 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -61,7 +61,7 @@ if { $chroot == "chroot" } { | |||
61 | "Child process initialized" | 61 | "Child process initialized" |
62 | } | 62 | } |
63 | sleep 1 | 63 | sleep 1 |
64 | 64 | ||
65 | send -- "ls -l /var/log/syslog | wc -l\r" | 65 | send -- "ls -l /var/log/syslog | wc -l\r" |
66 | expect { | 66 | expect { |
67 | timeout {puts "TESTING ERROR 5\n";exit} | 67 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/1.7.exp b/test/features/1.7.exp index b838c092f..dc73ae529 100755 --- a/test/features/1.7.exp +++ b/test/features/1.7.exp | |||
@@ -42,7 +42,7 @@ if { $overlay == "overlay" } { | |||
42 | "Child process initialized" {puts "normal system\n"} | 42 | "Child process initialized" {puts "normal system\n"} |
43 | } | 43 | } |
44 | sleep 1 | 44 | sleep 1 |
45 | 45 | ||
46 | send -- "ls -l /var/tmp/somefile | wc -l\r" | 46 | send -- "ls -l /var/tmp/somefile | wc -l\r" |
47 | expect { | 47 | expect { |
48 | timeout {puts "TESTING ERROR 3\n";exit} | 48 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -63,7 +63,7 @@ if { $chroot == "chroot" } { | |||
63 | "Child process initialized" | 63 | "Child process initialized" |
64 | } | 64 | } |
65 | sleep 1 | 65 | sleep 1 |
66 | 66 | ||
67 | send -- "ls -l /var/tmp/somefile | wc -l\r" | 67 | send -- "ls -l /var/tmp/somefile | wc -l\r" |
68 | expect { | 68 | expect { |
69 | timeout {puts "TESTING ERROR 5\n";exit} | 69 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/1.8.exp b/test/features/1.8.exp index 4c6d3f3dc..3bb43718e 100755 --- a/test/features/1.8.exp +++ b/test/features/1.8.exp | |||
@@ -107,7 +107,7 @@ if { $overlay == "overlay" } { | |||
107 | "Permission denied" | 107 | "Permission denied" |
108 | } | 108 | } |
109 | after 100 | 109 | after 100 |
110 | 110 | ||
111 | send -- "exit\r" | 111 | send -- "exit\r" |
112 | sleep 1 | 112 | sleep 1 |
113 | } | 113 | } |
diff --git a/test/features/2.1.exp b/test/features/2.1.exp index 074b5989b..d560d1a36 100755 --- a/test/features/2.1.exp +++ b/test/features/2.1.exp | |||
@@ -56,7 +56,7 @@ if { $overlay == "overlay" } { | |||
56 | "Child process initialized" {puts "normal system\n"} | 56 | "Child process initialized" {puts "normal system\n"} |
57 | } | 57 | } |
58 | sleep 1 | 58 | sleep 1 |
59 | 59 | ||
60 | send -- "hostname\r" | 60 | send -- "hostname\r" |
61 | expect { | 61 | expect { |
62 | timeout {puts "TESTING ERROR 3\n";exit} | 62 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -93,7 +93,7 @@ if { $chroot == "chroot" } { | |||
93 | "Child process initialized" | 93 | "Child process initialized" |
94 | } | 94 | } |
95 | sleep 1 | 95 | sleep 1 |
96 | 96 | ||
97 | send -- "hostname\r" | 97 | send -- "hostname\r" |
98 | expect { | 98 | expect { |
99 | timeout {puts "TESTING ERROR 5\n";exit} | 99 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/2.2.exp b/test/features/2.2.exp index f30ccaf79..00ed20e1f 100755 --- a/test/features/2.2.exp +++ b/test/features/2.2.exp | |||
@@ -48,7 +48,7 @@ if { $overlay == "overlay" } { | |||
48 | "Child process initialized" {puts "normal system\n"} | 48 | "Child process initialized" {puts "normal system\n"} |
49 | } | 49 | } |
50 | sleep 1 | 50 | sleep 1 |
51 | 51 | ||
52 | send -- "dig google.com\r" | 52 | send -- "dig google.com\r" |
53 | expect { | 53 | expect { |
54 | timeout {puts "TESTING ERROR 3\n";exit} | 54 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -77,7 +77,7 @@ if { $chroot == "chroot" } { | |||
77 | "Child process initialized" | 77 | "Child process initialized" |
78 | } | 78 | } |
79 | sleep 1 | 79 | sleep 1 |
80 | 80 | ||
81 | send -- "dig google.com\r" | 81 | send -- "dig google.com\r" |
82 | expect { | 82 | expect { |
83 | timeout {puts "TESTING ERROR 5\n";exit} | 83 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/2.3.exp b/test/features/2.3.exp index 63caab14c..9d3320d78 100755 --- a/test/features/2.3.exp +++ b/test/features/2.3.exp | |||
@@ -111,7 +111,7 @@ if { $overlay == "overlay" } { | |||
111 | "Child process initialized" {puts "normal system\n"} | 111 | "Child process initialized" {puts "normal system\n"} |
112 | } | 112 | } |
113 | sleep 1 | 113 | sleep 1 |
114 | 114 | ||
115 | send -- "dig google.com\r" | 115 | send -- "dig google.com\r" |
116 | expect { | 116 | expect { |
117 | timeout {puts "TESTING ERROR 3\n";exit} | 117 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -126,7 +126,7 @@ if { $overlay == "overlay" } { | |||
126 | "SERVER" | 126 | "SERVER" |
127 | } | 127 | } |
128 | after 100 | 128 | after 100 |
129 | 129 | ||
130 | send -- "/sbin/ifconfig\r" | 130 | send -- "/sbin/ifconfig\r" |
131 | expect { | 131 | expect { |
132 | timeout {puts "TESTING ERROR 3.4\n";exit} | 132 | timeout {puts "TESTING ERROR 3.4\n";exit} |
@@ -145,17 +145,17 @@ if { $overlay == "overlay" } { | |||
145 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" | 145 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" |
146 | } | 146 | } |
147 | after 100 | 147 | after 100 |
148 | 148 | ||
149 | send -- "exit\r" | 149 | send -- "exit\r" |
150 | sleep 3 | 150 | sleep 3 |
151 | 151 | ||
152 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --overlay --dns=8.8.8.8 --dns=8.8.4.4\r" | 152 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --overlay --dns=8.8.8.8 --dns=8.8.4.4\r" |
153 | expect { | 153 | expect { |
154 | timeout {puts "TESTING ERROR 2\n";exit} | 154 | timeout {puts "TESTING ERROR 2\n";exit} |
155 | "Child process initialized" | 155 | "Child process initialized" |
156 | } | 156 | } |
157 | sleep 1 | 157 | sleep 1 |
158 | 158 | ||
159 | send -- "dig google.com\r" | 159 | send -- "dig google.com\r" |
160 | expect { | 160 | expect { |
161 | timeout {puts "TESTING ERROR 3\n";exit} | 161 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -170,7 +170,7 @@ if { $overlay == "overlay" } { | |||
170 | "SERVER" | 170 | "SERVER" |
171 | } | 171 | } |
172 | after 100 | 172 | after 100 |
173 | 173 | ||
174 | send -- "/sbin/ifconfig\r" | 174 | send -- "/sbin/ifconfig\r" |
175 | expect { | 175 | expect { |
176 | timeout {puts "TESTING ERROR 3.4\n";exit} | 176 | timeout {puts "TESTING ERROR 3.4\n";exit} |
@@ -189,7 +189,7 @@ if { $overlay == "overlay" } { | |||
189 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" | 189 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" |
190 | } | 190 | } |
191 | after 100 | 191 | after 100 |
192 | 192 | ||
193 | send -- "exit\r" | 193 | send -- "exit\r" |
194 | sleep 3 | 194 | sleep 3 |
195 | } | 195 | } |
@@ -205,7 +205,7 @@ if { $chroot == "chroot" } { | |||
205 | "Child process initialized" | 205 | "Child process initialized" |
206 | } | 206 | } |
207 | sleep 1 | 207 | sleep 1 |
208 | 208 | ||
209 | send -- "dig google.com\r" | 209 | send -- "dig google.com\r" |
210 | expect { | 210 | expect { |
211 | timeout {puts "TESTING ERROR 5\n";exit} | 211 | timeout {puts "TESTING ERROR 5\n";exit} |
@@ -220,7 +220,7 @@ if { $chroot == "chroot" } { | |||
220 | "SERVER:" | 220 | "SERVER:" |
221 | } | 221 | } |
222 | after 100 | 222 | after 100 |
223 | 223 | ||
224 | send -- "/sbin/ifconfig\r" | 224 | send -- "/sbin/ifconfig\r" |
225 | expect { | 225 | expect { |
226 | timeout {puts "TESTING ERROR 5.4\n";exit} | 226 | timeout {puts "TESTING ERROR 5.4\n";exit} |
@@ -239,17 +239,17 @@ if { $chroot == "chroot" } { | |||
239 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" | 239 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" |
240 | } | 240 | } |
241 | after 100 | 241 | after 100 |
242 | 242 | ||
243 | send -- "exit\r" | 243 | send -- "exit\r" |
244 | sleep 3 | 244 | sleep 3 |
245 | 245 | ||
246 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --chroot=/tmp/chroot --dns=8.8.8.8 --dns=8.8.4.4\r" | 246 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --chroot=/tmp/chroot --dns=8.8.8.8 --dns=8.8.4.4\r" |
247 | expect { | 247 | expect { |
248 | timeout {puts "TESTING ERROR 4\n";exit} | 248 | timeout {puts "TESTING ERROR 4\n";exit} |
249 | "Child process initialized" | 249 | "Child process initialized" |
250 | } | 250 | } |
251 | sleep 1 | 251 | sleep 1 |
252 | 252 | ||
253 | send -- "dig google.com\r" | 253 | send -- "dig google.com\r" |
254 | expect { | 254 | expect { |
255 | timeout {puts "TESTING ERROR 5\n";exit} | 255 | timeout {puts "TESTING ERROR 5\n";exit} |
@@ -264,7 +264,7 @@ if { $chroot == "chroot" } { | |||
264 | "SERVER:" | 264 | "SERVER:" |
265 | } | 265 | } |
266 | after 100 | 266 | after 100 |
267 | 267 | ||
268 | send -- "/sbin/ifconfig\r" | 268 | send -- "/sbin/ifconfig\r" |
269 | expect { | 269 | expect { |
270 | timeout {puts "TESTING ERROR 5.4\n";exit} | 270 | timeout {puts "TESTING ERROR 5.4\n";exit} |
@@ -283,7 +283,7 @@ if { $chroot == "chroot" } { | |||
283 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" | 283 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" |
284 | } | 284 | } |
285 | after 100 | 285 | after 100 |
286 | 286 | ||
287 | send -- "exit\r" | 287 | send -- "exit\r" |
288 | sleep 1 | 288 | sleep 1 |
289 | } | 289 | } |
diff --git a/test/features/2.4.exp b/test/features/2.4.exp index fed596410..6784e1add 100755 --- a/test/features/2.4.exp +++ b/test/features/2.4.exp | |||
@@ -99,15 +99,15 @@ if { $overlay == "overlay" } { | |||
99 | "Child process initialized" {puts "normal system\n"} | 99 | "Child process initialized" {puts "normal system\n"} |
100 | } | 100 | } |
101 | sleep 1 | 101 | sleep 1 |
102 | 102 | ||
103 | send -- "ping -c 3 10.10.20.1\r" | 103 | send -- "ping -c 3 10.10.20.1\r" |
104 | expect { | 104 | expect { |
105 | timeout {puts "TESTING ERROR 3\n";exit} | 105 | timeout {puts "TESTING ERROR 3\n";exit} |
106 | " packets transmitted, 3 received, 0% packet loss" | 106 | " packets transmitted, 3 received, 0% packet loss" |
107 | } | 107 | } |
108 | sleep 1 | 108 | sleep 1 |
109 | 109 | ||
110 | 110 | ||
111 | send -- "/sbin/ifconfig\r" | 111 | send -- "/sbin/ifconfig\r" |
112 | expect { | 112 | expect { |
113 | timeout {puts "TESTING ERROR 3.4\n";exit} | 113 | timeout {puts "TESTING ERROR 3.4\n";exit} |
@@ -126,25 +126,25 @@ if { $overlay == "overlay" } { | |||
126 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" | 126 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" |
127 | } | 127 | } |
128 | after 100 | 128 | after 100 |
129 | 129 | ||
130 | send -- "exit\r" | 130 | send -- "exit\r" |
131 | sleep 1 | 131 | sleep 1 |
132 | 132 | ||
133 | send -- "firejail --noprofile --net=br0 --ip=10.10.20.4 --overlay\r" | 133 | send -- "firejail --noprofile --net=br0 --ip=10.10.20.4 --overlay\r" |
134 | expect { | 134 | expect { |
135 | timeout {puts "TESTING ERROR 2\n";exit} | 135 | timeout {puts "TESTING ERROR 2\n";exit} |
136 | "Child process initialized" | 136 | "Child process initialized" |
137 | } | 137 | } |
138 | sleep 1 | 138 | sleep 1 |
139 | 139 | ||
140 | send -- "ping -c 3 10.10.20.1\r" | 140 | send -- "ping -c 3 10.10.20.1\r" |
141 | expect { | 141 | expect { |
142 | timeout {puts "TESTING ERROR 3\n";exit} | 142 | timeout {puts "TESTING ERROR 3\n";exit} |
143 | " packets transmitted, 3 received, 0% packet loss" | 143 | " packets transmitted, 3 received, 0% packet loss" |
144 | } | 144 | } |
145 | sleep 1 | 145 | sleep 1 |
146 | 146 | ||
147 | 147 | ||
148 | send -- "/sbin/ifconfig\r" | 148 | send -- "/sbin/ifconfig\r" |
149 | expect { | 149 | expect { |
150 | timeout {puts "TESTING ERROR 3.4\n";exit} | 150 | timeout {puts "TESTING ERROR 3.4\n";exit} |
@@ -163,7 +163,7 @@ if { $overlay == "overlay" } { | |||
163 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" | 163 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" |
164 | } | 164 | } |
165 | after 100 | 165 | after 100 |
166 | 166 | ||
167 | send -- "exit\r" | 167 | send -- "exit\r" |
168 | sleep 1 | 168 | sleep 1 |
169 | } | 169 | } |
@@ -179,7 +179,7 @@ if { $chroot == "chroot" } { | |||
179 | "Child process initialized" | 179 | "Child process initialized" |
180 | } | 180 | } |
181 | sleep 1 | 181 | sleep 1 |
182 | 182 | ||
183 | send -- "/sbin/ifconfig\r" | 183 | send -- "/sbin/ifconfig\r" |
184 | expect { | 184 | expect { |
185 | timeout {puts "TESTING ERROR 5.4\n";exit} | 185 | timeout {puts "TESTING ERROR 5.4\n";exit} |
@@ -198,17 +198,17 @@ if { $chroot == "chroot" } { | |||
198 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" | 198 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" |
199 | } | 199 | } |
200 | after 100 | 200 | after 100 |
201 | 201 | ||
202 | send -- "exit\r" | 202 | send -- "exit\r" |
203 | sleep 1 | 203 | sleep 1 |
204 | 204 | ||
205 | send -- "firejail --noprofile --net=br0 --ip=10.10.20.4 --chroot=/tmp/chroot\r" | 205 | send -- "firejail --noprofile --net=br0 --ip=10.10.20.4 --chroot=/tmp/chroot\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 | "Child process initialized" |
209 | } | 209 | } |
210 | sleep 1 | 210 | sleep 1 |
211 | 211 | ||
212 | send -- "/sbin/ifconfig\r" | 212 | send -- "/sbin/ifconfig\r" |
213 | expect { | 213 | expect { |
214 | timeout {puts "TESTING ERROR 5.4\n";exit} | 214 | timeout {puts "TESTING ERROR 5.4\n";exit} |
@@ -227,7 +227,7 @@ if { $chroot == "chroot" } { | |||
227 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" | 227 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" |
228 | } | 228 | } |
229 | after 100 | 229 | after 100 |
230 | 230 | ||
231 | send -- "exit\r" | 231 | send -- "exit\r" |
232 | sleep 1 | 232 | sleep 1 |
233 | } | 233 | } |
diff --git a/test/features/2.5.exp b/test/features/2.5.exp index 1d6105ae8..2d4c7a9bc 100755 --- a/test/features/2.5.exp +++ b/test/features/2.5.exp | |||
@@ -51,7 +51,7 @@ if { $overlay == "overlay" } { | |||
51 | "Child process initialized" {puts "normal system\n"} | 51 | "Child process initialized" {puts "normal system\n"} |
52 | } | 52 | } |
53 | sleep 1 | 53 | sleep 1 |
54 | 54 | ||
55 | send -- "/sbin/ifconfig\r" | 55 | send -- "/sbin/ifconfig\r" |
56 | expect { | 56 | expect { |
57 | timeout {puts "TESTING ERROR 3.4\n";exit} | 57 | timeout {puts "TESTING ERROR 3.4\n";exit} |
@@ -84,7 +84,7 @@ if { $chroot == "chroot" } { | |||
84 | "Child process initialized" | 84 | "Child process initialized" |
85 | } | 85 | } |
86 | sleep 1 | 86 | sleep 1 |
87 | 87 | ||
88 | send -- "/sbin/ifconfig\r" | 88 | send -- "/sbin/ifconfig\r" |
89 | expect { | 89 | expect { |
90 | timeout {puts "TESTING ERROR 5.4\n";exit} | 90 | timeout {puts "TESTING ERROR 5.4\n";exit} |
diff --git a/test/features/2.6.exp b/test/features/2.6.exp index 596e8f435..63a9b3b90 100755 --- a/test/features/2.6.exp +++ b/test/features/2.6.exp | |||
@@ -39,7 +39,7 @@ if { $overlay == "overlay" } { | |||
39 | "Child process initialized" {puts "normal system\n"} | 39 | "Child process initialized" {puts "normal system\n"} |
40 | } | 40 | } |
41 | sleep 1 | 41 | sleep 1 |
42 | 42 | ||
43 | send -- "ip route show\r" | 43 | send -- "ip route show\r" |
44 | expect { | 44 | expect { |
45 | timeout {puts "TESTING ERROR 3\n";exit} | 45 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -60,7 +60,7 @@ if { $chroot == "chroot" } { | |||
60 | "Child process initialized" | 60 | "Child process initialized" |
61 | } | 61 | } |
62 | sleep 1 | 62 | sleep 1 |
63 | 63 | ||
64 | send -- "ip route show\r" | 64 | send -- "ip route show\r" |
65 | expect { | 65 | expect { |
66 | timeout {puts "TESTING ERROR 5\n";exit} | 66 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/3.1.exp b/test/features/3.1.exp index 046c703b7..3178cda42 100755 --- a/test/features/3.1.exp +++ b/test/features/3.1.exp | |||
@@ -70,13 +70,13 @@ if { $overlay == "overlay" } { | |||
70 | "Child process initialized" {puts "normal system\n"} | 70 | "Child process initialized" {puts "normal system\n"} |
71 | } | 71 | } |
72 | sleep 1 | 72 | sleep 1 |
73 | 73 | ||
74 | send -- "ls -al | wc -l\r" | 74 | send -- "ls -al | wc -l\r" |
75 | expect { | 75 | expect { |
76 | timeout {puts "TESTING ERROR 3.1\n";exit} | 76 | timeout {puts "TESTING ERROR 3.1\n";exit} |
77 | "6" | 77 | "6" |
78 | } | 78 | } |
79 | 79 | ||
80 | send -- "ls -al .bashrc\r" | 80 | send -- "ls -al .bashrc\r" |
81 | expect { | 81 | expect { |
82 | timeout {puts "TESTING ERROR 3.2\n";exit} | 82 | timeout {puts "TESTING ERROR 3.2\n";exit} |
@@ -90,7 +90,7 @@ if { $overlay == "overlay" } { | |||
90 | timeout {puts "TESTING ERROR 3.4\n";exit} | 90 | timeout {puts "TESTING ERROR 3.4\n";exit} |
91 | ".bashrc" | 91 | ".bashrc" |
92 | } | 92 | } |
93 | 93 | ||
94 | send -- "ls -al .Xauthority\r" | 94 | send -- "ls -al .Xauthority\r" |
95 | expect { | 95 | expect { |
96 | timeout {puts "TESTING ERROR 3.5\n";exit} | 96 | timeout {puts "TESTING ERROR 3.5\n";exit} |
@@ -120,13 +120,13 @@ if { $chroot == "chroot" } { | |||
120 | "Child process initialized" | 120 | "Child process initialized" |
121 | } | 121 | } |
122 | sleep 1 | 122 | sleep 1 |
123 | 123 | ||
124 | send -- "ls -al | wc -l\r" | 124 | send -- "ls -al | wc -l\r" |
125 | expect { | 125 | expect { |
126 | timeout {puts "TESTING ERROR 5.1\n";exit} | 126 | timeout {puts "TESTING ERROR 5.1\n";exit} |
127 | "5" | 127 | "5" |
128 | } | 128 | } |
129 | 129 | ||
130 | send -- "ls -al .bashrc\r" | 130 | send -- "ls -al .bashrc\r" |
131 | expect { | 131 | expect { |
132 | timeout {puts "TESTING ERROR 5.2\n";exit} | 132 | timeout {puts "TESTING ERROR 5.2\n";exit} |
@@ -140,7 +140,7 @@ if { $chroot == "chroot" } { | |||
140 | timeout {puts "TESTING ERROR 5.4\n";exit} | 140 | timeout {puts "TESTING ERROR 5.4\n";exit} |
141 | ".bashrc" | 141 | ".bashrc" |
142 | } | 142 | } |
143 | 143 | ||
144 | send -- "ls -al .Xauthority\r" | 144 | send -- "ls -al .Xauthority\r" |
145 | expect { | 145 | expect { |
146 | timeout {puts "TESTING ERROR 5.5\n";exit} | 146 | timeout {puts "TESTING ERROR 5.5\n";exit} |
@@ -154,7 +154,7 @@ if { $chroot == "chroot" } { | |||
154 | timeout {puts "TESTING ERROR 5.7\n";exit} | 154 | timeout {puts "TESTING ERROR 5.7\n";exit} |
155 | ".Xauthority" | 155 | ".Xauthority" |
156 | } | 156 | } |
157 | 157 | ||
158 | after 100 | 158 | after 100 |
159 | send -- "exit\r" | 159 | send -- "exit\r" |
160 | sleep 1 | 160 | sleep 1 |
diff --git a/test/features/3.10.exp b/test/features/3.10.exp index 4a06463a7..d6d858322 100755 --- a/test/features/3.10.exp +++ b/test/features/3.10.exp | |||
@@ -78,7 +78,7 @@ if { $overlay == "overlay" } { | |||
78 | "Child process initialized" {puts "normal system\n"} | 78 | "Child process initialized" {puts "normal system\n"} |
79 | } | 79 | } |
80 | sleep 1 | 80 | sleep 1 |
81 | 81 | ||
82 | send -- "ls -l /tmp | wc -l\r" | 82 | send -- "ls -l /tmp | wc -l\r" |
83 | expect { | 83 | expect { |
84 | timeout {puts "TESTING ERROR 3.1\n";exit} | 84 | timeout {puts "TESTING ERROR 3.1\n";exit} |
@@ -97,7 +97,7 @@ if { $overlay == "overlay" } { | |||
97 | timeout {puts "TESTING ERROR 3.4\n";exit} | 97 | timeout {puts "TESTING ERROR 3.4\n";exit} |
98 | "test1dir" | 98 | "test1dir" |
99 | } | 99 | } |
100 | 100 | ||
101 | send -- "ls -l /tmp/test1dir | wc -l\r" | 101 | send -- "ls -l /tmp/test1dir | wc -l\r" |
102 | expect { | 102 | expect { |
103 | timeout {puts "TESTING ERROR 3.5\n";exit} | 103 | timeout {puts "TESTING ERROR 3.5\n";exit} |
@@ -136,7 +136,7 @@ if { $chroot == "chroot" } { | |||
136 | "Child process initialized" | 136 | "Child process initialized" |
137 | } | 137 | } |
138 | sleep 1 | 138 | sleep 1 |
139 | 139 | ||
140 | send -- "ls -l /tmp | wc -l\r" | 140 | send -- "ls -l /tmp | wc -l\r" |
141 | expect { | 141 | expect { |
142 | timeout {puts "TESTING ERROR 5.1\n";exit} | 142 | timeout {puts "TESTING ERROR 5.1\n";exit} |
@@ -155,7 +155,7 @@ if { $chroot == "chroot" } { | |||
155 | timeout {puts "TESTING ERROR 5.4\n";exit} | 155 | timeout {puts "TESTING ERROR 5.4\n";exit} |
156 | "test1dir" | 156 | "test1dir" |
157 | } | 157 | } |
158 | 158 | ||
159 | send -- "ls -l /tmp/test1dir | wc -l\r" | 159 | send -- "ls -l /tmp/test1dir | wc -l\r" |
160 | expect { | 160 | expect { |
161 | timeout {puts "TESTING ERROR 5.5\n";exit} | 161 | timeout {puts "TESTING ERROR 5.5\n";exit} |
@@ -174,7 +174,7 @@ if { $chroot == "chroot" } { | |||
174 | timeout {puts "TESTING ERROR 5.8\n";exit} | 174 | timeout {puts "TESTING ERROR 5.8\n";exit} |
175 | "test1" | 175 | "test1" |
176 | } | 176 | } |
177 | 177 | ||
178 | after 100 | 178 | after 100 |
179 | send -- "exit\r" | 179 | send -- "exit\r" |
180 | sleep 1 | 180 | sleep 1 |
diff --git a/test/features/3.11.exp b/test/features/3.11.exp index dc41ed743..4e89aa372 100755 --- a/test/features/3.11.exp +++ b/test/features/3.11.exp | |||
@@ -65,7 +65,7 @@ sleep 1 | |||
65 | if { $overlay == "overlay" } { | 65 | if { $overlay == "overlay" } { |
66 | send -- "rm -fr ~/firejail-xy76_u9\r" | 66 | send -- "rm -fr ~/firejail-xy76_u9\r" |
67 | sleep 1 | 67 | sleep 1 |
68 | 68 | ||
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} |
@@ -73,7 +73,7 @@ if { $overlay == "overlay" } { | |||
73 | "Child process initialized" {puts "normal system\n"} | 73 | "Child process initialized" {puts "normal system\n"} |
74 | } | 74 | } |
75 | sleep 1 | 75 | sleep 1 |
76 | 76 | ||
77 | send -- "ls -l ~ | grep firejail-xy76_u9\r" | 77 | send -- "ls -l ~ | grep firejail-xy76_u9\r" |
78 | expect { | 78 | expect { |
79 | timeout {puts "TESTING ERROR 11\n";exit} | 79 | timeout {puts "TESTING ERROR 11\n";exit} |
@@ -89,7 +89,7 @@ if { $overlay == "overlay" } { | |||
89 | "firejail-xy76_u9" | 89 | "firejail-xy76_u9" |
90 | } | 90 | } |
91 | after 100 | 91 | after 100 |
92 | 92 | ||
93 | send -- "ls -l ~/firejail-xy76_u9\r" | 93 | send -- "ls -l ~/firejail-xy76_u9\r" |
94 | expect { | 94 | expect { |
95 | timeout {puts "TESTING ERROR 14\n";exit} | 95 | timeout {puts "TESTING ERROR 14\n";exit} |
@@ -105,7 +105,7 @@ if { $overlay == "overlay" } { | |||
105 | "testdir" | 105 | "testdir" |
106 | } | 106 | } |
107 | after 100 | 107 | after 100 |
108 | 108 | ||
109 | send -- "exit\r" | 109 | send -- "exit\r" |
110 | sleep 1 | 110 | sleep 1 |
111 | send -- "rm -fr ~/firejail-xy76_u9\r" | 111 | send -- "rm -fr ~/firejail-xy76_u9\r" |
@@ -120,14 +120,14 @@ if { $overlay == "overlay" } { | |||
120 | if { $chroot == "chroot" } { | 120 | if { $chroot == "chroot" } { |
121 | send -- "rm -fr ~/firejail-xy76_u9\r" | 121 | send -- "rm -fr ~/firejail-xy76_u9\r" |
122 | sleep 1 | 122 | sleep 1 |
123 | 123 | ||
124 | send -- "firejail --profile=3.11.profile\r" | 124 | send -- "firejail --profile=3.11.profile\r" |
125 | expect { | 125 | expect { |
126 | timeout {puts "TESTING ERROR 20\n";exit} | 126 | timeout {puts "TESTING ERROR 20\n";exit} |
127 | "Child process initialized" | 127 | "Child process initialized" |
128 | } | 128 | } |
129 | sleep 1 | 129 | sleep 1 |
130 | 130 | ||
131 | send -- "ls -l ~ | grep firejail-xy76_u9\r" | 131 | send -- "ls -l ~ | grep firejail-xy76_u9\r" |
132 | expect { | 132 | expect { |
133 | timeout {puts "TESTING ERROR 21\n";exit} | 133 | timeout {puts "TESTING ERROR 21\n";exit} |
@@ -143,7 +143,7 @@ if { $chroot == "chroot" } { | |||
143 | "firejail-xy76_u9" | 143 | "firejail-xy76_u9" |
144 | } | 144 | } |
145 | after 100 | 145 | after 100 |
146 | 146 | ||
147 | send -- "ls -l ~/firejail-xy76_u9\r" | 147 | send -- "ls -l ~/firejail-xy76_u9\r" |
148 | expect { | 148 | expect { |
149 | timeout {puts "TESTING ERROR 24\n";exit} | 149 | timeout {puts "TESTING ERROR 24\n";exit} |
@@ -159,7 +159,7 @@ if { $chroot == "chroot" } { | |||
159 | "testdir" | 159 | "testdir" |
160 | } | 160 | } |
161 | after 100 | 161 | after 100 |
162 | 162 | ||
163 | send -- "rm -fr ~/firejail-xy76_u9\r" | 163 | send -- "rm -fr ~/firejail-xy76_u9\r" |
164 | sleep 1 | 164 | sleep 1 |
165 | 165 | ||
@@ -169,4 +169,3 @@ if { $chroot == "chroot" } { | |||
169 | 169 | ||
170 | 170 | ||
171 | puts "\nall done\n" | 171 | puts "\nall done\n" |
172 | |||
diff --git a/test/features/3.2.exp b/test/features/3.2.exp index be20b1547..271bbdda1 100755 --- a/test/features/3.2.exp +++ b/test/features/3.2.exp | |||
@@ -41,7 +41,7 @@ if { $overlay == "overlay" } { | |||
41 | "Child process initialized" {puts "normal system\n"} | 41 | "Child process initialized" {puts "normal system\n"} |
42 | } | 42 | } |
43 | sleep 1 | 43 | sleep 1 |
44 | 44 | ||
45 | send -- "touch ~/.config/firejail-test-file\r" | 45 | send -- "touch ~/.config/firejail-test-file\r" |
46 | expect { | 46 | expect { |
47 | timeout {puts "TESTING ERROR 3\n";exit} | 47 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -64,7 +64,7 @@ if { $chroot == "chroot" } { | |||
64 | "Child process initialized" | 64 | "Child process initialized" |
65 | } | 65 | } |
66 | sleep 1 | 66 | sleep 1 |
67 | 67 | ||
68 | send -- "touch ~/.config/firejail-test-file\r" | 68 | send -- "touch ~/.config/firejail-test-file\r" |
69 | expect { | 69 | expect { |
70 | timeout {puts "TESTING ERROR 5\n";exit} | 70 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/3.3.exp b/test/features/3.3.exp index bb2c34dc1..c662410dc 100755 --- a/test/features/3.3.exp +++ b/test/features/3.3.exp | |||
@@ -40,7 +40,7 @@ if { $overlay == "overlay" } { | |||
40 | "Child process initialized" {puts "normal system\n"} | 40 | "Child process initialized" {puts "normal system\n"} |
41 | } | 41 | } |
42 | sleep 1 | 42 | sleep 1 |
43 | 43 | ||
44 | send -- "cd ~/.config\r" | 44 | send -- "cd ~/.config\r" |
45 | expect { | 45 | expect { |
46 | timeout {puts "TESTING ERROR 3\n";exit} | 46 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -61,7 +61,7 @@ if { $chroot == "chroot" } { | |||
61 | "Child process initialized" | 61 | "Child process initialized" |
62 | } | 62 | } |
63 | sleep 1 | 63 | sleep 1 |
64 | 64 | ||
65 | send -- "cd ~/.config\r" | 65 | send -- "cd ~/.config\r" |
66 | expect { | 66 | expect { |
67 | timeout {puts "TESTING ERROR 5\n";exit} | 67 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/3.4.exp b/test/features/3.4.exp index 7ed439669..2e0f7cae7 100755 --- a/test/features/3.4.exp +++ b/test/features/3.4.exp | |||
@@ -83,13 +83,13 @@ if { $overlay == "overlay" } { | |||
83 | "Child process initialized" {puts "normal system\n"} | 83 | "Child process initialized" {puts "normal system\n"} |
84 | } | 84 | } |
85 | sleep 1 | 85 | sleep 1 |
86 | 86 | ||
87 | send -- "ls -al | wc -l\r" | 87 | send -- "ls -al | wc -l\r" |
88 | expect { | 88 | expect { |
89 | timeout {puts "TESTING ERROR 3.1\n";exit} | 89 | timeout {puts "TESTING ERROR 3.1\n";exit} |
90 | "6" | 90 | "6" |
91 | } | 91 | } |
92 | 92 | ||
93 | send -- "ls -al .bashrc\r" | 93 | send -- "ls -al .bashrc\r" |
94 | expect { | 94 | expect { |
95 | timeout {puts "TESTING ERROR 3.2\n";exit} | 95 | timeout {puts "TESTING ERROR 3.2\n";exit} |
@@ -117,7 +117,7 @@ if { $overlay == "overlay" } { | |||
117 | timeout {puts "TESTING ERROR 3.7\n";exit} | 117 | timeout {puts "TESTING ERROR 3.7\n";exit} |
118 | ".Xauthority" | 118 | ".Xauthority" |
119 | } | 119 | } |
120 | 120 | ||
121 | send -- "ls -al | grep .config\r" | 121 | send -- "ls -al | grep .config\r" |
122 | expect { | 122 | expect { |
123 | timeout {puts "TESTING ERROR 3.8\n";exit} | 123 | timeout {puts "TESTING ERROR 3.8\n";exit} |
@@ -147,13 +147,13 @@ if { $chroot == "chroot" } { | |||
147 | "Child process initialized" | 147 | "Child process initialized" |
148 | } | 148 | } |
149 | sleep 1 | 149 | sleep 1 |
150 | 150 | ||
151 | send -- "ls -al | wc -l\r" | 151 | send -- "ls -al | wc -l\r" |
152 | expect { | 152 | expect { |
153 | timeout {puts "TESTING ERROR 5.1\n";exit} | 153 | timeout {puts "TESTING ERROR 5.1\n";exit} |
154 | "6" | 154 | "6" |
155 | } | 155 | } |
156 | 156 | ||
157 | send -- "ls -al .bashrc\r" | 157 | send -- "ls -al .bashrc\r" |
158 | expect { | 158 | expect { |
159 | timeout {puts "TESTING ERROR 5.2\n";exit} | 159 | timeout {puts "TESTING ERROR 5.2\n";exit} |
@@ -181,7 +181,7 @@ if { $chroot == "chroot" } { | |||
181 | timeout {puts "TESTING ERROR 5.7\n";exit} | 181 | timeout {puts "TESTING ERROR 5.7\n";exit} |
182 | ".Xauthority" | 182 | ".Xauthority" |
183 | } | 183 | } |
184 | 184 | ||
185 | send -- "ls -al | grep .config\r" | 185 | send -- "ls -al | grep .config\r" |
186 | expect { | 186 | expect { |
187 | timeout {puts "TESTING ERROR 5.8\n";exit} | 187 | timeout {puts "TESTING ERROR 5.8\n";exit} |
diff --git a/test/features/3.5.exp b/test/features/3.5.exp index f4b544b3d..abaf42a0e 100755 --- a/test/features/3.5.exp +++ b/test/features/3.5.exp | |||
@@ -41,14 +41,14 @@ if { $overlay == "overlay" } { | |||
41 | "Child process initialized" {puts "normal system\n"} | 41 | "Child process initialized" {puts "normal system\n"} |
42 | } | 42 | } |
43 | sleep 1 | 43 | sleep 1 |
44 | 44 | ||
45 | send -- "ls -l /dev | wc -l\r" | 45 | send -- "ls -l /dev | wc -l\r" |
46 | expect { | 46 | expect { |
47 | timeout {puts "TESTING ERROR 3.1\n";exit} | 47 | timeout {puts "TESTING ERROR 3.1\n";exit} |
48 | "13" { puts "Debian\n"} | 48 | "13" { puts "Debian\n"} |
49 | "12" { puts "Centos\n"} | 49 | "12" { puts "Centos\n"} |
50 | } | 50 | } |
51 | 51 | ||
52 | after 100 | 52 | after 100 |
53 | send -- "exit\r" | 53 | send -- "exit\r" |
54 | sleep 1 | 54 | sleep 1 |
@@ -64,13 +64,13 @@ if { $chroot == "chroot" } { | |||
64 | "Child process initialized" | 64 | "Child process initialized" |
65 | } | 65 | } |
66 | sleep 1 | 66 | sleep 1 |
67 | 67 | ||
68 | send -- "ls -l /dev | wc -l\r" | 68 | send -- "ls -l /dev | wc -l\r" |
69 | expect { | 69 | expect { |
70 | timeout {puts "TESTING ERROR 5.1\n";exit} | 70 | timeout {puts "TESTING ERROR 5.1\n";exit} |
71 | "12" | 71 | "12" |
72 | } | 72 | } |
73 | 73 | ||
74 | after 100 | 74 | after 100 |
75 | send -- "exit\r" | 75 | send -- "exit\r" |
76 | sleep 1 | 76 | sleep 1 |
diff --git a/test/features/3.6.exp b/test/features/3.6.exp index 389e63a1d..043a24121 100755 --- a/test/features/3.6.exp +++ b/test/features/3.6.exp | |||
@@ -40,13 +40,13 @@ if { $overlay == "overlay" } { | |||
40 | "Child process initialized" {puts "normal system\n"} | 40 | "Child process initialized" {puts "normal system\n"} |
41 | } | 41 | } |
42 | sleep 1 | 42 | sleep 1 |
43 | 43 | ||
44 | send -- "ls -al /etc | wc -l\r" | 44 | send -- "ls -al /etc | wc -l\r" |
45 | expect { | 45 | expect { |
46 | timeout {puts "TESTING ERROR 3.1\n";exit} | 46 | timeout {puts "TESTING ERROR 3.1\n";exit} |
47 | "10" | 47 | "10" |
48 | } | 48 | } |
49 | 49 | ||
50 | after 100 | 50 | after 100 |
51 | send -- "exit\r" | 51 | send -- "exit\r" |
52 | sleep 1 | 52 | sleep 1 |
@@ -68,13 +68,13 @@ if { $chroot == "chroot" } { | |||
68 | "Child process initialized" | 68 | "Child process initialized" |
69 | } | 69 | } |
70 | sleep 1 | 70 | sleep 1 |
71 | 71 | ||
72 | send -- "ls /etc | grep firejail\r" | 72 | send -- "ls /etc | grep firejail\r" |
73 | expect { | 73 | expect { |
74 | timeout {puts "TESTING ERROR 6\n";exit} | 74 | timeout {puts "TESTING ERROR 6\n";exit} |
75 | "firejail" | 75 | "firejail" |
76 | } | 76 | } |
77 | 77 | ||
78 | after 100 | 78 | after 100 |
79 | send -- "exit\r" | 79 | send -- "exit\r" |
80 | sleep 1 | 80 | sleep 1 |
diff --git a/test/features/3.7.exp b/test/features/3.7.exp index 2a9ce84d6..bcd50c389 100755 --- a/test/features/3.7.exp +++ b/test/features/3.7.exp | |||
@@ -49,13 +49,13 @@ if { $overlay == "overlay" } { | |||
49 | "Child process initialized" {puts "normal system\n"} | 49 | "Child process initialized" {puts "normal system\n"} |
50 | } | 50 | } |
51 | sleep 1 | 51 | sleep 1 |
52 | 52 | ||
53 | send -- "ls -al /tmp | wc -l\r" | 53 | send -- "ls -al /tmp | wc -l\r" |
54 | expect { | 54 | expect { |
55 | timeout {puts "TESTING ERROR 3.1\n";exit} | 55 | timeout {puts "TESTING ERROR 3.1\n";exit} |
56 | "3" | 56 | "3" |
57 | } | 57 | } |
58 | 58 | ||
59 | 59 | ||
60 | after 100 | 60 | after 100 |
61 | send -- "exit\r" | 61 | send -- "exit\r" |
@@ -76,13 +76,13 @@ if { $chroot == "chroot" } { | |||
76 | "Child process initialized" | 76 | "Child process initialized" |
77 | } | 77 | } |
78 | sleep 1 | 78 | sleep 1 |
79 | 79 | ||
80 | send -- "ls -al /tmp | wc -l\r" | 80 | send -- "ls -al /tmp | wc -l\r" |
81 | expect { | 81 | expect { |
82 | timeout {puts "TESTING ERROR 5.1\n";exit} | 82 | timeout {puts "TESTING ERROR 5.1\n";exit} |
83 | "3" | 83 | "3" |
84 | } | 84 | } |
85 | 85 | ||
86 | after 100 | 86 | after 100 |
87 | send -- "exit\r" | 87 | send -- "exit\r" |
88 | sleep 1 | 88 | sleep 1 |
diff --git a/test/features/3.8.exp b/test/features/3.8.exp index d941fa9b7..4497b9f19 100755 --- a/test/features/3.8.exp +++ b/test/features/3.8.exp | |||
@@ -41,13 +41,13 @@ if { $overlay == "overlay" } { | |||
41 | "Child process initialized" {puts "normal system\n"} | 41 | "Child process initialized" {puts "normal system\n"} |
42 | } | 42 | } |
43 | sleep 1 | 43 | sleep 1 |
44 | 44 | ||
45 | send -- "ls -l /usr/bin | wc -l\r" | 45 | send -- "ls -l /usr/bin | wc -l\r" |
46 | expect { | 46 | expect { |
47 | timeout {puts "TESTING ERROR 3.1\n";exit} | 47 | timeout {puts "TESTING ERROR 3.1\n";exit} |
48 | "6" | 48 | "6" |
49 | } | 49 | } |
50 | 50 | ||
51 | 51 | ||
52 | after 100 | 52 | after 100 |
53 | send -- "exit\r" | 53 | send -- "exit\r" |
@@ -68,13 +68,13 @@ if { $chroot == "chroot" } { | |||
68 | "Child process initialized" | 68 | "Child process initialized" |
69 | } | 69 | } |
70 | sleep 1 | 70 | sleep 1 |
71 | 71 | ||
72 | send -- "ls -l /usr/bin | wc -l\r" | 72 | send -- "ls -l /usr/bin | wc -l\r" |
73 | expect { | 73 | expect { |
74 | timeout {puts "TESTING ERROR 6\n";exit} | 74 | timeout {puts "TESTING ERROR 6\n";exit} |
75 | "9" | 75 | "9" |
76 | } | 76 | } |
77 | 77 | ||
78 | after 100 | 78 | after 100 |
79 | send -- "exit\r" | 79 | send -- "exit\r" |
80 | sleep 1 | 80 | sleep 1 |
diff --git a/test/features/3.9.exp b/test/features/3.9.exp index 660ccbe05..e6cefa0f6 100755 --- a/test/features/3.9.exp +++ b/test/features/3.9.exp | |||
@@ -42,13 +42,13 @@ if { $overlay == "overlay" } { | |||
42 | "Child process initialized" {puts "normal system\n"} | 42 | "Child process initialized" {puts "normal system\n"} |
43 | } | 43 | } |
44 | sleep 1 | 44 | sleep 1 |
45 | 45 | ||
46 | send -- "ls -l /dev | wc -l\r" | 46 | send -- "ls -l /dev | wc -l\r" |
47 | expect { | 47 | expect { |
48 | timeout {puts "TESTING ERROR 3.1\n";exit} | 48 | timeout {puts "TESTING ERROR 3.1\n";exit} |
49 | "3" | 49 | "3" |
50 | } | 50 | } |
51 | 51 | ||
52 | 52 | ||
53 | after 100 | 53 | after 100 |
54 | send -- "exit\r" | 54 | send -- "exit\r" |
@@ -65,13 +65,13 @@ if { $chroot == "chroot" } { | |||
65 | "Child process initialized" | 65 | "Child process initialized" |
66 | } | 66 | } |
67 | sleep 1 | 67 | sleep 1 |
68 | 68 | ||
69 | send -- "ls -l /dev | wc -l\r" | 69 | send -- "ls -l /dev | wc -l\r" |
70 | expect { | 70 | expect { |
71 | timeout {puts "TESTING ERROR 5.1\n";exit} | 71 | timeout {puts "TESTING ERROR 5.1\n";exit} |
72 | "3" | 72 | "3" |
73 | } | 73 | } |
74 | 74 | ||
75 | after 100 | 75 | after 100 |
76 | send -- "exit\r" | 76 | send -- "exit\r" |
77 | sleep 1 | 77 | sleep 1 |
diff --git a/test/features/features.txt b/test/features/features.txt index b793257c3..904803234 100644 --- a/test/features/features.txt +++ b/test/features/features.txt | |||
@@ -59,7 +59,3 @@ C - chroot filesystem | |||
59 | 3.10 whitelist tmp | 59 | 3.10 whitelist tmp |
60 | - O not working on Arch Linux - todo | 60 | - O not working on Arch Linux - todo |
61 | 3.11 mkdir | 61 | 3.11 mkdir |
62 | |||
63 | |||
64 | |||
65 | |||
diff --git a/test/features/test.sh b/test/features/test.sh index f28da37d5..cf62d0a3d 100755 --- a/test/features/test.sh +++ b/test/features/test.sh | |||
@@ -115,4 +115,3 @@ echo "TESTING: 3.10 whitelist tmp" | |||
115 | 115 | ||
116 | echo "TESTING: 3.11 mkdir" | 116 | echo "TESTING: 3.11 mkdir" |
117 | ./3.11.exp $OVERLAY $CHROOT | 117 | ./3.11.exp $OVERLAY $CHROOT |
118 | |||