cleanup

3 files changed, 72 insertions, 1 deletions

diff --git a/test/root/join.exp b/test/root/join.exp
new file mode 100755
index 000000000..e4a4e87af
--- /dev/null
+++ b/test/root/join.exp
@@ -0,0 +1,52 @@
+#!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
+
+set timeout 10
+cd /home
+spawn $env(SHELL)
+match_max 100000
+
+send --  "firejail --name=jointesting --cpu=0 --nice=2\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "Child process initialized"
+}
+sleep 2
+
+spawn $env(SHELL)
+send --  "firejail --join=jointesting\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "Switching to pid"
+}
+sleep 1
+send -- "ps aux\r"
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "/bin/bash"
+}
+expect {
+        timeout {puts "TESTING ERROR 3\n";exit}
+        "/bin/bash"
+}
+
+send -- "exit\r"
+sleep 1
+send --  "firejail --join-network=jointesting\r"
+expect {
+        timeout {puts "TESTING ERROR 4\n";exit}
+        "Child process initialized"
+}
+send -- "exit\r"
+sleep 1
+send --  "firejail --join-filesystem=jointesting\r"
+expect {
+        timeout {puts "TESTING ERROR 5\n";exit}
+        "Child process initialized"
+}
+
+after 100
+
+puts "\nall done\n"
diff --git a/test/root/root.sh b/test/root/root.sh
index 371bccdff..9764b3804 100755
--- a/test/root/root.sh
+++ b/test/root/root.sh
@@ -57,6 +57,12 @@ echo "TESTING: fs whitelist mnt, opt, media (test/root/whitelist-mnt.exp)"
 ./whitelist.exp
 
 #********************************
+# utils
+#********************************
+echo "TESTING: join (test/root/join.exp)"
+./join.exp
+
+#********************************
 # seccomp
 #********************************
 echo "TESTING: seccomp umount (test/root/seccomp-umount.exp)"
diff --git a/test/utils/join.exp b/test/utils/join.exp
index fc30bc6a4..79fe99f2d 100755
--- a/test/utils/join.exp
+++ b/test/utils/join.exp
@@ -32,7 +32,20 @@ expect {
         "/bin/bash"
 }
 
-send -- "exit"
+send -- "exit\r"
+sleep 1
+send --  "firejail --join-network=jointesting\r"
+expect {
+        timeout {puts "TESTING ERROR 4\n";exit}
+        "is only available to root user"
+}
+after 100
+send --  "firejail --join-filesystem=jointesting\r"
+expect {
+        timeout {puts "TESTING ERROR 5\n";exit}
+        "is only available to root user"
+}
+
 after 100
 
 puts "\nall done\n"