diff options
author | netblue30 <netblue30@yahoo.com> | 2018-04-13 11:15:48 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2018-04-13 11:15:48 -0400 |
commit | e19a3320081c91fdf05895d87b42e60bcf5e2408 (patch) | |
tree | ca19eb115b98a13bc238273a52e74b35c3a8ac1f /test | |
parent | fix problem found by smitsohu (diff) | |
download | firejail-e19a3320081c91fdf05895d87b42e60bcf5e2408.tar.gz firejail-e19a3320081c91fdf05895d87b42e60bcf5e2408.tar.zst firejail-e19a3320081c91fdf05895d87b42e60bcf5e2408.zip |
testing
Diffstat (limited to 'test')
-rwxr-xr-x | test/environment/allow-debuggers.exp | 25 | ||||
-rwxr-xr-x | test/environment/environment.sh | 3 | ||||
-rwxr-xr-x | test/environment/firejail-in-firejail2.exp | 51 | ||||
-rwxr-xr-x | test/fnetfilter/default.exp | 2 | ||||
-rwxr-xr-x | test/fnetfilter/template.exp | 2 |
5 files changed, 10 insertions, 73 deletions
diff --git a/test/environment/allow-debuggers.exp b/test/environment/allow-debuggers.exp index 359f94db1..f92ec5ddf 100755 --- a/test/environment/allow-debuggers.exp +++ b/test/environment/allow-debuggers.exp | |||
@@ -5,36 +5,27 @@ cd /home | |||
5 | spawn $env(SHELL) | 5 | spawn $env(SHELL) |
6 | match_max 100000 | 6 | match_max 100000 |
7 | 7 | ||
8 | send -- "firejail --profile=/etc/firejail/firefox.profile --allow-debuggers strace ls\r" | 8 | send -- "firejail --allow-debuggers\r" |
9 | expect { | 9 | expect { |
10 | timeout {puts "TESTING ERROR 0\n";exit} | 10 | timeout {puts "TESTING ERROR 0\n";exit} |
11 | "Child process initialized" { puts "\n"} | 11 | "Child process initialized" { puts "\n"} |
12 | "is disabled on Linux kernels prior to 4.8" { puts "TESTING SKIP: kernel too old\n"; exit } | 12 | "is disabled on Linux kernels prior to 4.8" { puts "TESTING SKIP: kernel too old\n"; exit } |
13 | } | 13 | } |
14 | expect { | ||
15 | timeout {puts "TESTING ERROR 1\n";exit} | ||
16 | "ioctl" | ||
17 | } | ||
18 | expect { | ||
19 | timeout {puts "TESTING ERROR 2\n";exit} | ||
20 | "exit_group" | ||
21 | } | ||
22 | after 100 | 14 | after 100 |
23 | 15 | ||
24 | send -- "firejail --allow-debuggers --profile=/etc/firejail/firefox.profile strace ls\r" | 16 | send -- "strace ls\r" |
25 | expect { | ||
26 | timeout {puts "TESTING ERROR 3\n";exit} | ||
27 | "Child process initialized" | ||
28 | } | ||
29 | expect { | 17 | expect { |
30 | timeout {puts "TESTING ERROR 4\n";exit} | 18 | timeout {puts "TESTING ERROR 1\n";exit} |
31 | "ioctl" | 19 | "open" |
32 | } | 20 | } |
33 | expect { | 21 | expect { |
34 | timeout {puts "TESTING ERROR 5\n";exit} | 22 | timeout {puts "TESTING ERROR 2\n";exit} |
35 | "exit_group" | 23 | "exit_group" |
36 | } | 24 | } |
37 | after 100 | 25 | after 100 |
26 | send -- "exit\r" | ||
27 | sleep 1 | ||
28 | |||
38 | 29 | ||
39 | 30 | ||
40 | puts "\nall done\n" | 31 | puts "\nall done\n" |
diff --git a/test/environment/environment.sh b/test/environment/environment.sh index b6688d484..364a4b65b 100755 --- a/test/environment/environment.sh +++ b/test/environment/environment.sh | |||
@@ -68,9 +68,6 @@ fi | |||
68 | echo "TESTING: firejail in firejail - single sandbox (test/environment/firejail-in-firejail.exp)" | 68 | echo "TESTING: firejail in firejail - single sandbox (test/environment/firejail-in-firejail.exp)" |
69 | ./firejail-in-firejail.exp | 69 | ./firejail-in-firejail.exp |
70 | 70 | ||
71 | echo "TESTING: firejail in firejail - force new sandbox (test/environment/firejail-in-firejail2.exp)" | ||
72 | ./firejail-in-firejail2.exp | ||
73 | |||
74 | which aplay | 71 | which aplay |
75 | if [ "$?" -eq 0 ]; | 72 | if [ "$?" -eq 0 ]; |
76 | then | 73 | then |
diff --git a/test/environment/firejail-in-firejail2.exp b/test/environment/firejail-in-firejail2.exp deleted file mode 100755 index 6528e45cd..000000000 --- a/test/environment/firejail-in-firejail2.exp +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | #!/usr/bin/expect -f | ||
2 | # This file is part of Firejail project | ||
3 | # Copyright (C) 2014-2018 Firejail Authors | ||
4 | # License GPL v2 | ||
5 | |||
6 | set timeout 10 | ||
7 | spawn $env(SHELL) | ||
8 | match_max 100000 | ||
9 | |||
10 | send -- "firejail --noprofile\r" | ||
11 | expect { | ||
12 | timeout {puts "TESTING ERROR 1\n";exit} | ||
13 | "Child process initialized" | ||
14 | } | ||
15 | sleep 1 | ||
16 | |||
17 | send -- "firejail\r" | ||
18 | expect { | ||
19 | timeout {puts "TESTING ERROR 2\n";exit} | ||
20 | "Warning: an existing sandbox was detected" | ||
21 | } | ||
22 | after 100 | ||
23 | |||
24 | send -- "exit\r" | ||
25 | after 100 | ||
26 | |||
27 | send -- "firejail --force\r" | ||
28 | expect { | ||
29 | timeout {puts "TESTING ERROR 3\n";exit} | ||
30 | "Child process initialized" | ||
31 | } | ||
32 | after 100 | ||
33 | |||
34 | send -- "exit\r" | ||
35 | after 100 | ||
36 | |||
37 | send -- "firejail --version\r" | ||
38 | expect { | ||
39 | timeout {puts "TESTING ERROR 4\n";exit} | ||
40 | "firejail version" | ||
41 | } | ||
42 | after 100 | ||
43 | |||
44 | send -- "firejail --version --force\r" | ||
45 | expect { | ||
46 | timeout {puts "TESTING ERROR 5\n";exit} | ||
47 | "firejail version" | ||
48 | } | ||
49 | after 100 | ||
50 | |||
51 | puts "\nall done\n" | ||
diff --git a/test/fnetfilter/default.exp b/test/fnetfilter/default.exp index 4c24b370f..8406160e3 100755 --- a/test/fnetfilter/default.exp +++ b/test/fnetfilter/default.exp | |||
@@ -31,7 +31,7 @@ after 100 | |||
31 | send -- "fnetfilter test1.net,33\r" | 31 | send -- "fnetfilter test1.net,33\r" |
32 | expect { | 32 | expect { |
33 | timeout {puts "TESTING ERROR 4\n";exit} | 33 | timeout {puts "TESTING ERROR 4\n";exit} |
34 | "invalid destination file in netfilter command" | 34 | "cannot open test1.net,33" |
35 | } | 35 | } |
36 | after 100 | 36 | after 100 |
37 | send -- "rm outfile\r" | 37 | send -- "rm outfile\r" |
diff --git a/test/fnetfilter/template.exp b/test/fnetfilter/template.exp index b63a2d4c9..5b84166d8 100755 --- a/test/fnetfilter/template.exp +++ b/test/fnetfilter/template.exp | |||
@@ -66,7 +66,7 @@ after 100 | |||
66 | send -- "fnetfilter test2.net,icmp-type,destination-unreachable,time-exceeded,echo-request\r" | 66 | send -- "fnetfilter test2.net,icmp-type,destination-unreachable,time-exceeded,echo-request\r" |
67 | expect { | 67 | expect { |
68 | timeout {puts "TESTING ERROR 12\n";exit} | 68 | timeout {puts "TESTING ERROR 12\n";exit} |
69 | "invalid destination file in netfilter command" | 69 | "cannot open test2.net," |
70 | } | 70 | } |
71 | after 100 | 71 | after 100 |
72 | 72 | ||