test fixes

3 files changed, 5 insertions, 5 deletions

diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 4473e306c..5cfee44d8 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -722,7 +722,7 @@ int sandbox(void* sandbox_arg) {
         if (arg_noroot) {
                 int rv = unshare(CLONE_NEWUSER);
                 if (rv == -1) {
-                        fprintf(stderr, "Warning: cannot mount a new user namespace, going forward without it...\n");
+                        fprintf(stderr, "Warning: cannot create a new user namespace, going forward without it...\n");
                         drop_privs(arg_nogroups);
                         arg_noroot = 0;
                 }
diff --git a/test/filters/noroot.exp b/test/filters/noroot.exp
index a1f6ce88d..7f4f189ee 100755
--- a/test/filters/noroot.exp
+++ b/test/filters/noroot.exp
@@ -10,6 +10,7 @@ match_max 100000
 send -- "firejail --noprofile --noroot --caps.drop=all --seccomp\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
+        "cannot create a new user namespace" {puts "TESTING SKIP: user namespace not available\n"; exit}
         "Child process initialized"
 }
 sleep 1
diff --git a/test/filters/seccomp-dualfilter.exp b/test/filters/seccomp-dualfilter.exp
index 7c964d5c3..7efc117da 100755
--- a/test/filters/seccomp-dualfilter.exp
+++ b/test/filters/seccomp-dualfilter.exp
@@ -25,10 +25,9 @@ sleep 1
 
 send -- "firejail ./syscall_test32 mount\r"
 expect {
-        "syscall_test32: No such file or directory" {puts "\nTESTING SKIP 3: can't execute 32 bit binary\n"; exit}
-}
-expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
+        timeout {puts "TESTING ERROR 4\n";exit}
+        "No such file or directory" {puts "\nTESTING SKIP 3: can't execute 32 bit binary\n"; exit}
+        "Parent is shutting down, bye" {puts "\nTESTING SKIP 3: can't execute 32 bit binary\n"; exit}
         "Child process initialized"
 }
 expect {