various fixes

3 files changed, 27 insertions, 3 deletions

diff --git a/test/firefox-x11.exp b/test/firefox-x11.exp
index c82408896..8bc7fbd25 100755
--- a/test/firefox-x11.exp
+++ b/test/firefox-x11.exp
@@ -4,7 +4,7 @@ set timeout 10
 spawn $env(SHELL)
 match_max 100000
 
-send -- "firejail --name=test --x11 --net=br0 firefox www.gentoo.org\r"
+send -- "firejail --name=test --x11 --net=br0 firefox -no-remote www.gentoo.org\r"
 sleep 10
 
 spawn $env(SHELL)
@@ -18,6 +18,10 @@ expect {
         "firefox" {puts "firefox detected\n";}
         "iceweasel" {puts "iceweasel detected\n";}
 }
+expect {
+        timeout {puts "TESTING ERROR 3.2\n";exit}
+        "no-remote"
+}
 sleep 1
 send -- "firejail --name=blablabla\r"
 expect {
@@ -34,6 +38,10 @@ expect {
         " iceweasel" {puts "iceweasel detected\n";}
 }
 expect {
+        timeout {puts "TESTING ERROR 5.0\n";exit}
+        "no-remote"
+}
+expect {
         timeout {puts "TESTING ERROR 5.1 (seccomp)\n";exit}
         "Seccomp:       2"
 }
@@ -49,6 +57,10 @@ expect {
         " iceweasel" {puts "iceweasel detected\n";}
 }
 expect {
+        timeout {puts "TESTING ERROR 6.0\n";exit}
+        "no-remote"
+}
+expect {
         timeout {puts "TESTING ERROR 6.1\n";exit}
         "CapBnd:"
 }
diff --git a/test/firefox.exp b/test/firefox.exp
index c2e64e04f..d531cf977 100755
--- a/test/firefox.exp
+++ b/test/firefox.exp
@@ -4,7 +4,7 @@ set timeout 10
 spawn $env(SHELL)
 match_max 100000
 
-send -- "firejail firefox www.gentoo.org\r"
+send -- "firejail firefox -no-remote www.gentoo.org\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Reading profile /etc/firejail/firefox.profile"
@@ -26,6 +26,10 @@ expect {
         "firefox" {puts "firefox detected\n";}
         "iceweasel" {puts "iceweasel detected\n";}
 }
+expect {
+        timeout {puts "TESTING ERROR 3.2\n";exit}
+        "no-remote"
+}
 sleep 1
 send -- "firejail --name=blablabla\r"
 expect {
@@ -42,6 +46,10 @@ expect {
         " iceweasel" {puts "iceweasel detected\n";}
 }
 expect {
+        timeout {puts "TESTING ERROR 5.0\n";exit}
+        "no-remote"
+}
+expect {
         timeout {puts "TESTING ERROR 5.1 (seccomp)\n";exit}
         "Seccomp:       2"
 }
@@ -57,6 +65,10 @@ expect {
         " iceweasel" {puts "iceweasel detected\n";}
 }
 expect {
+        timeout {puts "TESTING ERROR 6.0\n";exit}
+        "no-remote"
+}
+expect {
         timeout {puts "TESTING ERROR 6.1\n";exit}
         "CapBnd:"
 }
diff --git a/test/test-profile.exp b/test/test-profile.exp
index 89fe9c10a..a03e8db31 100755
--- a/test/test-profile.exp
+++ b/test/test-profile.exp
@@ -10,7 +10,7 @@ if { $argc != 1 } {
         exit
 }
 
-send -- "firejail --profile=$argv\r"
+send -- "firejail --profile=$argv /bin/bash\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Child process initialized"