diff options
author | netblue30 <netblue30@yahoo.com> | 2016-05-03 13:16:33 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-05-03 13:16:33 -0400 |
commit | f2f331553c5fe3c78a44e9a0b0b9026fcb59745a (patch) | |
tree | e6033bf3f51a0a851fb8bfc4d5f34cc57f118396 | |
parent | testing (diff) | |
download | firejail-f2f331553c5fe3c78a44e9a0b0b9026fcb59745a.tar.gz firejail-f2f331553c5fe3c78a44e9a0b0b9026fcb59745a.tar.zst firejail-f2f331553c5fe3c78a44e9a0b0b9026fcb59745a.zip |
test fixes
-rw-r--r-- | src/firejail/sandbox.c | 2 | ||||
-rwxr-xr-x | test/filters/noroot.exp | 1 | ||||
-rwxr-xr-x | test/filters/seccomp-dualfilter.exp | 7 |
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) { | |||
722 | if (arg_noroot) { | 722 | if (arg_noroot) { |
723 | int rv = unshare(CLONE_NEWUSER); | 723 | int rv = unshare(CLONE_NEWUSER); |
724 | if (rv == -1) { | 724 | if (rv == -1) { |
725 | fprintf(stderr, "Warning: cannot mount a new user namespace, going forward without it...\n"); | 725 | fprintf(stderr, "Warning: cannot create a new user namespace, going forward without it...\n"); |
726 | drop_privs(arg_nogroups); | 726 | drop_privs(arg_nogroups); |
727 | arg_noroot = 0; | 727 | arg_noroot = 0; |
728 | } | 728 | } |
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 | |||
10 | send -- "firejail --noprofile --noroot --caps.drop=all --seccomp\r" | 10 | send -- "firejail --noprofile --noroot --caps.drop=all --seccomp\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "cannot create a new user namespace" {puts "TESTING SKIP: user namespace not available\n"; exit} | ||
13 | "Child process initialized" | 14 | "Child process initialized" |
14 | } | 15 | } |
15 | sleep 1 | 16 | 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 | |||
25 | 25 | ||
26 | send -- "firejail ./syscall_test32 mount\r" | 26 | send -- "firejail ./syscall_test32 mount\r" |
27 | expect { | 27 | expect { |
28 | "syscall_test32: No such file or directory" {puts "\nTESTING SKIP 3: can't execute 32 bit binary\n"; exit} | 28 | timeout {puts "TESTING ERROR 4\n";exit} |
29 | } | 29 | "No such file or directory" {puts "\nTESTING SKIP 3: can't execute 32 bit binary\n"; exit} |
30 | expect { | 30 | "Parent is shutting down, bye" {puts "\nTESTING SKIP 3: can't execute 32 bit binary\n"; exit} |
31 | timeout {puts "TESTING ERROR 4\n";exit} | ||
32 | "Child process initialized" | 31 | "Child process initialized" |
33 | } | 32 | } |
34 | expect { | 33 | expect { |