diff options
Diffstat (limited to 'test')
-rwxr-xr-x | test/apps-x11/xterm-xpra.exp | 12 | ||||
-rwxr-xr-x | test/environment/environment.sh | 6 | ||||
-rwxr-xr-x | test/rlimit/rlimit-profile.exp (renamed from test/environment/rlimit-profile.exp) | 0 | ||||
-rwxr-xr-x | test/rlimit/rlimit.exp (renamed from test/environment/rlimit.exp) | 0 | ||||
-rw-r--r-- | test/rlimit/rlimit.profile (renamed from test/environment/rlimit.profile) | 0 | ||||
-rwxr-xr-x | test/root/apache2.exp | 4 | ||||
-rwxr-xr-x | test/root/isc-dhcp.exp | 9 | ||||
-rwxr-xr-x | test/root/nginx.exp | 4 | ||||
-rwxr-xr-x | test/root/root.sh | 6 | ||||
-rwxr-xr-x | test/root/snmpd.exp | 10 | ||||
-rwxr-xr-x | test/root/unbound.exp | 9 |
11 files changed, 18 insertions, 42 deletions
diff --git a/test/apps-x11/xterm-xpra.exp b/test/apps-x11/xterm-xpra.exp index 379de131a..1fb5df486 100755 --- a/test/apps-x11/xterm-xpra.exp +++ b/test/apps-x11/xterm-xpra.exp | |||
@@ -79,6 +79,18 @@ expect { | |||
79 | "name=blablabla" | 79 | "name=blablabla" |
80 | } | 80 | } |
81 | sleep 1 | 81 | sleep 1 |
82 | |||
83 | send -- "firemon --x11\r" | ||
84 | expect { | ||
85 | timeout {puts "TESTING ERROR 7\n";exit} | ||
86 | "name=test xterm" | ||
87 | } | ||
88 | expect { | ||
89 | timeout {puts "TESTING ERROR 7.1\n";exit} | ||
90 | "DISPLAY" | ||
91 | } | ||
92 | sleep 1 | ||
93 | |||
82 | send -- "firejail --shutdown=test\r" | 94 | send -- "firejail --shutdown=test\r" |
83 | sleep 3 | 95 | sleep 3 |
84 | 96 | ||
diff --git a/test/environment/environment.sh b/test/environment/environment.sh index 04a1daaf6..5c4d49331 100755 --- a/test/environment/environment.sh +++ b/test/environment/environment.sh | |||
@@ -55,12 +55,6 @@ else | |||
55 | echo "TESTING SKIP: zsh not found" | 55 | echo "TESTING SKIP: zsh not found" |
56 | fi | 56 | fi |
57 | 57 | ||
58 | echo "TESTING: rlimit (test/environment/rlimit.exp)" | ||
59 | ./rlimit.exp | ||
60 | |||
61 | echo "TESTING: rlimit profile (test/environment/rlimit-profile.exp)" | ||
62 | ./rlimit-profile.exp | ||
63 | |||
64 | echo "TESTING: firejail in firejail - single sandbox (test/environment/firejail-in-firejail.exp)" | 58 | echo "TESTING: firejail in firejail - single sandbox (test/environment/firejail-in-firejail.exp)" |
65 | ./firejail-in-firejail.exp | 59 | ./firejail-in-firejail.exp |
66 | 60 | ||
diff --git a/test/environment/rlimit-profile.exp b/test/rlimit/rlimit-profile.exp index a9e54a405..a9e54a405 100755 --- a/test/environment/rlimit-profile.exp +++ b/test/rlimit/rlimit-profile.exp | |||
diff --git a/test/environment/rlimit.exp b/test/rlimit/rlimit.exp index 611f69821..611f69821 100755 --- a/test/environment/rlimit.exp +++ b/test/rlimit/rlimit.exp | |||
diff --git a/test/environment/rlimit.profile b/test/rlimit/rlimit.profile index 271891c03..271891c03 100644 --- a/test/environment/rlimit.profile +++ b/test/rlimit/rlimit.profile | |||
diff --git a/test/root/apache2.exp b/test/root/apache2.exp index 7f67f4706..0b102bad5 100755 --- a/test/root/apache2.exp +++ b/test/root/apache2.exp | |||
@@ -4,10 +4,6 @@ set timeout 5 | |||
4 | spawn $env(SHELL) | 4 | spawn $env(SHELL) |
5 | match_max 100000 | 5 | match_max 100000 |
6 | 6 | ||
7 | send -- "pkill apache\r" | ||
8 | sleep 2 | ||
9 | |||
10 | |||
11 | send -- "firejail --name=apache /etc/init.d/apache2 start\r" | 7 | send -- "firejail --name=apache /etc/init.d/apache2 start\r" |
12 | expect { | 8 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 9 | timeout {puts "TESTING ERROR 0\n";exit} |
diff --git a/test/root/isc-dhcp.exp b/test/root/isc-dhcp.exp index 86500707a..5d9597e7c 100755 --- a/test/root/isc-dhcp.exp +++ b/test/root/isc-dhcp.exp | |||
@@ -4,15 +4,6 @@ set timeout 5 | |||
4 | spawn $env(SHELL) | 4 | spawn $env(SHELL) |
5 | match_max 100000 | 5 | match_max 100000 |
6 | 6 | ||
7 | send -- "sudo ls; sudo whoami; sudo pwd\r" | ||
8 | expect { | ||
9 | timeout {puts "TESTING ERROR: you need to root run this test as root\n";exit} | ||
10 | "root" | ||
11 | } | ||
12 | |||
13 | send -- "pkill dhcpd\r" | ||
14 | sleep 2 | ||
15 | |||
16 | send -- "firejail --name=dhcpd /etc/init.d/isc-dhcp-server start\r" | 7 | send -- "firejail --name=dhcpd /etc/init.d/isc-dhcp-server start\r" |
17 | expect { | 8 | expect { |
18 | timeout {puts "TESTING ERROR 0\n";exit} | 9 | timeout {puts "TESTING ERROR 0\n";exit} |
diff --git a/test/root/nginx.exp b/test/root/nginx.exp index 0b62fada9..82ebe0ee7 100755 --- a/test/root/nginx.exp +++ b/test/root/nginx.exp | |||
@@ -4,10 +4,6 @@ set timeout 5 | |||
4 | spawn $env(SHELL) | 4 | spawn $env(SHELL) |
5 | match_max 100000 | 5 | match_max 100000 |
6 | 6 | ||
7 | send -- "pkill nginx\r" | ||
8 | sleep 2 | ||
9 | |||
10 | |||
11 | send -- "firejail --name=nginx /etc/init.d/nginx start\r" | 7 | send -- "firejail --name=nginx /etc/init.d/nginx start\r" |
12 | expect { | 8 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 9 | timeout {puts "TESTING ERROR 0\n";exit} |
diff --git a/test/root/root.sh b/test/root/root.sh index 471b7d535..494bd4fe7 100755 --- a/test/root/root.sh +++ b/test/root/root.sh | |||
@@ -48,6 +48,12 @@ else | |||
48 | fi | 48 | fi |
49 | 49 | ||
50 | #******************************** | 50 | #******************************** |
51 | # filesystem | ||
52 | #******************************** | ||
53 | echo "TESTING: fs private (test/root/private.exp)" | ||
54 | ./private.exp | ||
55 | |||
56 | #******************************** | ||
51 | # seccomp | 57 | # seccomp |
52 | #******************************** | 58 | #******************************** |
53 | echo "TESTING: seccomp umount (test/root/seccomp-umount.exp)" | 59 | echo "TESTING: seccomp umount (test/root/seccomp-umount.exp)" |
diff --git a/test/root/snmpd.exp b/test/root/snmpd.exp index 90e34470f..610fdb13a 100755 --- a/test/root/snmpd.exp +++ b/test/root/snmpd.exp | |||
@@ -4,16 +4,6 @@ set timeout 5 | |||
4 | spawn $env(SHELL) | 4 | spawn $env(SHELL) |
5 | match_max 100000 | 5 | match_max 100000 |
6 | 6 | ||
7 | send -- "sudo ls; sudo whoami; sudo pwd\r" | ||
8 | expect { | ||
9 | timeout {puts "TESTING ERROR: you need to root run this test as root\n";exit} | ||
10 | "root" | ||
11 | } | ||
12 | |||
13 | send -- "pkill snmpd\r" | ||
14 | sleep 2 | ||
15 | |||
16 | |||
17 | send -- "firejail --name=snmpd /etc/init.d/snmpd start\r" | 7 | send -- "firejail --name=snmpd /etc/init.d/snmpd start\r" |
18 | expect { | 8 | expect { |
19 | timeout {puts "TESTING ERROR 0\n";exit} | 9 | timeout {puts "TESTING ERROR 0\n";exit} |
diff --git a/test/root/unbound.exp b/test/root/unbound.exp index 193e662ff..9c496306a 100755 --- a/test/root/unbound.exp +++ b/test/root/unbound.exp | |||
@@ -4,15 +4,6 @@ set timeout 5 | |||
4 | spawn $env(SHELL) | 4 | spawn $env(SHELL) |
5 | match_max 100000 | 5 | match_max 100000 |
6 | 6 | ||
7 | send -- "sudo ls; sudo whoami; sudo pwd\r" | ||
8 | expect { | ||
9 | timeout {puts "TESTING ERROR: you need to root run this test as root\n";exit} | ||
10 | "root" | ||
11 | } | ||
12 | |||
13 | send -- "pkill unbound\r" | ||
14 | sleep 2 | ||
15 | |||
16 | send -- "firejail --name=unbound unbound\r" | 7 | send -- "firejail --name=unbound unbound\r" |
17 | expect { | 8 | expect { |
18 | timeout {puts "TESTING ERROR 0\n";exit} | 9 | timeout {puts "TESTING ERROR 0\n";exit} |