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 {
         "name=blablabla"
 }
 sleep 1
+
+send -- "firemon --x11\r"
+expect {
+        timeout {puts "TESTING ERROR 7\n";exit}
+        "name=test xterm"
+}
+expect {
+        timeout {puts "TESTING ERROR 7.1\n";exit}
+        "DISPLAY"
+}
+sleep 1
+
 send -- "firejail --shutdown=test\r"
 sleep 3
 
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
         echo "TESTING SKIP: zsh not found"
 fi
 
-echo "TESTING: rlimit (test/environment/rlimit.exp)"
-./rlimit.exp
-
-echo "TESTING: rlimit profile (test/environment/rlimit-profile.exp)"
-./rlimit-profile.exp
-
 echo "TESTING: firejail in firejail - single sandbox (test/environment/firejail-in-firejail.exp)"
 ./firejail-in-firejail.exp
 
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
 spawn $env(SHELL)
 match_max 100000
 
-send -- "pkill apache\r"
-sleep 2
-
-
 send -- "firejail --name=apache /etc/init.d/apache2 start\r"
 expect {
         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
 spawn $env(SHELL)
 match_max 100000
 
-send -- "sudo ls; sudo whoami; sudo pwd\r"
-expect {
-        timeout {puts "TESTING ERROR: you need to root run this test as root\n";exit}
-        "root"
-}
-
-send -- "pkill dhcpd\r"
-sleep 2
-
 send -- "firejail --name=dhcpd /etc/init.d/isc-dhcp-server start\r"
 expect {
         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
 spawn $env(SHELL)
 match_max 100000
 
-send -- "pkill nginx\r"
-sleep 2
-
-
 send -- "firejail --name=nginx /etc/init.d/nginx start\r"
 expect {
         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
 fi
 
 #********************************
+# filesystem
+#********************************
+echo "TESTING: fs private (test/root/private.exp)"
+./private.exp
+
+#********************************
 # seccomp
 #********************************
 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
 spawn $env(SHELL)
 match_max 100000
 
-send -- "sudo ls; sudo whoami; sudo pwd\r"
-expect {
-        timeout {puts "TESTING ERROR: you need to root run this test as root\n";exit}
-        "root"
-}
-
-send -- "pkill snmpd\r"
-sleep 2
-
-
 send -- "firejail --name=snmpd /etc/init.d/snmpd start\r"
 expect {
         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
 spawn $env(SHELL)
 match_max 100000
 
-send -- "sudo ls; sudo whoami; sudo pwd\r"
-expect {
-        timeout {puts "TESTING ERROR: you need to root run this test as root\n";exit}
-        "root"
-}
-
-send -- "pkill unbound\r"
-sleep 2
-
 send -- "firejail --name=unbound unbound\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}