diff options
Diffstat (limited to 'test/fs')
-rwxr-xr-x | test/fs/mkdir_mkfile.exp | 10 | ||||
-rwxr-xr-x | test/fs/private-home-dir.exp | 10 | ||||
-rwxr-xr-x | test/fs/private.exp | 8 | ||||
-rwxr-xr-x | test/fs/whitelist-double.exp | 4 | ||||
-rwxr-xr-x | test/fs/whitelist-downloads.exp | 4 | ||||
-rwxr-xr-x | test/fs/whitelist-empty.exp | 12 |
6 files changed, 24 insertions, 24 deletions
diff --git a/test/fs/mkdir_mkfile.exp b/test/fs/mkdir_mkfile.exp index 28a5ae459..1faa913e0 100755 --- a/test/fs/mkdir_mkfile.exp +++ b/test/fs/mkdir_mkfile.exp | |||
@@ -16,11 +16,7 @@ expect { | |||
16 | } | 16 | } |
17 | sleep 1 | 17 | sleep 1 |
18 | 18 | ||
19 | send -- "find ~\r" | 19 | send -- "find ~ | LC_ALL=C sort\r" |
20 | expect { | ||
21 | timeout {puts "TESTING ERROR 1\n";exit} | ||
22 | "_firejail_test_file" | ||
23 | } | ||
24 | expect { | 20 | expect { |
25 | timeout {puts "TESTING ERROR 1\n";exit} | 21 | timeout {puts "TESTING ERROR 1\n";exit} |
26 | "_firejail_test_dir" | 22 | "_firejail_test_dir" |
@@ -41,6 +37,10 @@ expect { | |||
41 | timeout {puts "TESTING ERROR 1\n";exit} | 37 | timeout {puts "TESTING ERROR 1\n";exit} |
42 | "_firejail_test_dir/dir1/dir2/dir3/file1" | 38 | "_firejail_test_dir/dir1/dir2/dir3/file1" |
43 | } | 39 | } |
40 | expect { | ||
41 | timeout {puts "TESTING ERROR 1\n";exit} | ||
42 | "_firejail_test_file" | ||
43 | } | ||
44 | after 100 | 44 | after 100 |
45 | send -- "exit\r" | 45 | send -- "exit\r" |
46 | after 100 | 46 | after 100 |
diff --git a/test/fs/private-home-dir.exp b/test/fs/private-home-dir.exp index 77baeeb5f..9c97ff4ea 100755 --- a/test/fs/private-home-dir.exp +++ b/test/fs/private-home-dir.exp | |||
@@ -41,7 +41,11 @@ expect { | |||
41 | } | 41 | } |
42 | after 100 | 42 | after 100 |
43 | 43 | ||
44 | send -- "ls -al ~\r" | 44 | send -- "find ~ | LC_ALL=C sort\r" |
45 | expect { | ||
46 | timeout {puts "TESTING ERROR 4\n";exit} | ||
47 | ".Xauthority" | ||
48 | } | ||
45 | expect { | 49 | expect { |
46 | timeout {puts "TESTING ERROR 2\n";exit} | 50 | timeout {puts "TESTING ERROR 2\n";exit} |
47 | ".asoundrc" | 51 | ".asoundrc" |
@@ -50,10 +54,6 @@ expect { | |||
50 | timeout {puts "TESTING ERROR 3\n";exit} | 54 | timeout {puts "TESTING ERROR 3\n";exit} |
51 | ".bashrc" | 55 | ".bashrc" |
52 | } | 56 | } |
53 | expect { | ||
54 | timeout {puts "TESTING ERROR 4\n";exit} | ||
55 | ".Xauthority" | ||
56 | } | ||
57 | after 100 | 57 | after 100 |
58 | 58 | ||
59 | send -- "exit\r" | 59 | send -- "exit\r" |
diff --git a/test/fs/private.exp b/test/fs/private.exp index c7059079d..e522ca5a1 100755 --- a/test/fs/private.exp +++ b/test/fs/private.exp | |||
@@ -37,18 +37,18 @@ expect { | |||
37 | } | 37 | } |
38 | after 100 | 38 | after 100 |
39 | 39 | ||
40 | send -- "ls -al ~\r" | 40 | send -- "find ~ | LC_ALL=C sort\r" |
41 | expect { | 41 | expect { |
42 | timeout {puts "TESTING ERROR 2\n";exit} | 42 | timeout {puts "TESTING ERROR 2\n";exit} |
43 | ".asoundrc" | 43 | ".Xauthority" |
44 | } | 44 | } |
45 | expect { | 45 | expect { |
46 | timeout {puts "TESTING ERROR 3\n";exit} | 46 | timeout {puts "TESTING ERROR 3\n";exit} |
47 | ".bashrc" | 47 | ".asoundrc" |
48 | } | 48 | } |
49 | expect { | 49 | expect { |
50 | timeout {puts "TESTING ERROR 4\n";exit} | 50 | timeout {puts "TESTING ERROR 4\n";exit} |
51 | ".Xauthority" | 51 | ".bashrc" |
52 | } | 52 | } |
53 | after 100 | 53 | after 100 |
54 | 54 | ||
diff --git a/test/fs/whitelist-double.exp b/test/fs/whitelist-double.exp index dd2336ce1..ac6adc165 100755 --- a/test/fs/whitelist-double.exp +++ b/test/fs/whitelist-double.exp | |||
@@ -32,10 +32,10 @@ expect { | |||
32 | "123" | 32 | "123" |
33 | } | 33 | } |
34 | 34 | ||
35 | send -- "rm /tmp/firejal-deleteme\r" | 35 | send -- "rm -v /tmp/firejal-deleteme\r" |
36 | expect { | 36 | expect { |
37 | timeout {puts "TESTING ERROR 3\n";exit} | 37 | timeout {puts "TESTING ERROR 3\n";exit} |
38 | "0" | 38 | "removed" |
39 | } | 39 | } |
40 | after 100 | 40 | after 100 |
41 | 41 | ||
diff --git a/test/fs/whitelist-downloads.exp b/test/fs/whitelist-downloads.exp index f3eb0d6a2..a64197953 100755 --- a/test/fs/whitelist-downloads.exp +++ b/test/fs/whitelist-downloads.exp | |||
@@ -17,7 +17,7 @@ expect { | |||
17 | } | 17 | } |
18 | after 100 | 18 | after 100 |
19 | 19 | ||
20 | send -- "firejail --force --profile=/etc/firejail/firefox.profile\r" | 20 | send -- "firejail --force --ignore=shell --profile=/etc/firejail/firefox.profile\r" |
21 | expect { | 21 | expect { |
22 | timeout {puts "TESTING ERROR 1\n";exit} | 22 | timeout {puts "TESTING ERROR 1\n";exit} |
23 | "cannot whitelist Downloads directory" | 23 | "cannot whitelist Downloads directory" |
@@ -34,7 +34,7 @@ after 100 | |||
34 | send -- "cp /tmp/user-dirs.dirs ~/.config/.\r" | 34 | send -- "cp /tmp/user-dirs.dirs ~/.config/.\r" |
35 | after 100 | 35 | after 100 |
36 | 36 | ||
37 | send -- "firejail --force --profile=/etc/firejail/firefox.profile\r" | 37 | send -- "firejail --force --ignore=shell --profile=/etc/firejail/firefox.profile\r" |
38 | expect { | 38 | expect { |
39 | timeout {puts "TESTING ERROR 3\n";exit} | 39 | timeout {puts "TESTING ERROR 3\n";exit} |
40 | "cannot whitelist Downloads directory" | 40 | "cannot whitelist Downloads directory" |
diff --git a/test/fs/whitelist-empty.exp b/test/fs/whitelist-empty.exp index e1c3ffb4a..9e4406263 100755 --- a/test/fs/whitelist-empty.exp +++ b/test/fs/whitelist-empty.exp | |||
@@ -14,36 +14,36 @@ expect { | |||
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
17 | send -- "ls -l ~/ | wc -l\r" | 17 | send -- "ls -l ~\r" |
18 | expect { | 18 | expect { |
19 | timeout {puts "TESTING ERROR 1\n";exit} | 19 | timeout {puts "TESTING ERROR 1\n";exit} |
20 | "0" | 20 | "0" |
21 | } | 21 | } |
22 | 22 | ||
23 | send -- "ls -l /tmp | wc -l\r" | 23 | send -- "ls -l /tmp\r" |
24 | expect { | 24 | expect { |
25 | timeout {puts "TESTING ERROR 2\n";exit} | 25 | timeout {puts "TESTING ERROR 2\n";exit} |
26 | "0" | 26 | "0" |
27 | } | 27 | } |
28 | 28 | ||
29 | send -- "ls -l /media | wc -l\r" | 29 | send -- "ls -l /media\r" |
30 | expect { | 30 | expect { |
31 | timeout {puts "TESTING ERROR 3\n";exit} | 31 | timeout {puts "TESTING ERROR 3\n";exit} |
32 | "0" | 32 | "0" |
33 | } | 33 | } |
34 | 34 | ||
35 | send -- "ls -l /var | wc -l\r" | 35 | send -- "ls -l /var\r" |
36 | expect { | 36 | expect { |
37 | timeout {puts "TESTING ERROR 4\n";exit} | 37 | timeout {puts "TESTING ERROR 4\n";exit} |
38 | "0" | 38 | "0" |
39 | } | 39 | } |
40 | 40 | ||
41 | send -- "ls -l /dev | wc -l\r" | 41 | send -- "ls -l /dev\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 5\n";exit} | 43 | timeout {puts "TESTING ERROR 5\n";exit} |
44 | "0" | 44 | "0" |
45 | } | 45 | } |
46 | send -- "ls -l /opt | wc -l\r" | 46 | send -- "ls -l /opt\r" |
47 | expect { | 47 | expect { |
48 | timeout {puts "TESTING ERROR 6\n";exit} | 48 | timeout {puts "TESTING ERROR 6\n";exit} |
49 | "0" | 49 | "0" |