diff options
-rwxr-xr-x | test/fs/fs.sh | 10 | ||||
-rwxr-xr-x | test/fs/private-cache.exp | 6 | ||||
-rwxr-xr-x | test/fs/whitelist-readonly.exp (renamed from test/fs/readonly-whitelist.exp) | 0 | ||||
-rwxr-xr-x | test/fs/whitelist-whitespace.exp | 7 |
4 files changed, 8 insertions, 15 deletions
diff --git a/test/fs/fs.sh b/test/fs/fs.sh index 7ea8de542..fa642443f 100755 --- a/test/fs/fs.sh +++ b/test/fs/fs.sh | |||
@@ -21,8 +21,8 @@ mkdir ~/_firejail_test_dir/test1 | |||
21 | touch ~/_firejail_test_dir/test1/b | 21 | touch ~/_firejail_test_dir/test1/b |
22 | echo "TESTING: read/write (test/fs/read-write.exp)" | 22 | echo "TESTING: read/write (test/fs/read-write.exp)" |
23 | ./read-write.exp | 23 | ./read-write.exp |
24 | echo "TESTING: readonly whitelist (test/fs/readonly-whitelist.exp)" | 24 | echo "TESTING: whitelist readonly (test/fs/whitelist-readonly.exp)" |
25 | ./readonly-whitelist.exp | 25 | ./whitelist-readonly.exp |
26 | rm -fr ~/_firejail_test_* | 26 | rm -fr ~/_firejail_test_* |
27 | 27 | ||
28 | echo "TESTING: /sys/fs access (test/fs/sys_fs.exp)" | 28 | echo "TESTING: /sys/fs access (test/fs/sys_fs.exp)" |
@@ -108,15 +108,15 @@ echo "TESTING: recursive mkdir (test/fs/mkdir.exp)" | |||
108 | echo "TESTING: double whitelist (test/fs/whitelist-double.exp)" | 108 | echo "TESTING: double whitelist (test/fs/whitelist-double.exp)" |
109 | ./whitelist-double.exp | 109 | ./whitelist-double.exp |
110 | 110 | ||
111 | echo "TESTING: whitelist file with whitespaces (test/fs/whitelist-whitespace.exp)" | ||
112 | ./whitelist-whitespace.exp | ||
113 | |||
114 | echo "TESTING: whitelist (test/fs/whitelist.exp)" | 111 | echo "TESTING: whitelist (test/fs/whitelist.exp)" |
115 | ./whitelist.exp | 112 | ./whitelist.exp |
116 | 113 | ||
117 | echo "TESTING: whitelist dev, var(test/fs/whitelist-dev.exp)" | 114 | echo "TESTING: whitelist dev, var(test/fs/whitelist-dev.exp)" |
118 | ./whitelist-dev.exp | 115 | ./whitelist-dev.exp |
119 | 116 | ||
117 | echo "TESTING: whitelist with whitespaces (test/fs/whitelist-whitespace.exp)" | ||
118 | ./whitelist-whitespace.exp | ||
119 | |||
120 | echo "TESTING: fscheck --bind non root (test/fs/fscheck-bindnoroot.exp)" | 120 | echo "TESTING: fscheck --bind non root (test/fs/fscheck-bindnoroot.exp)" |
121 | ./fscheck-bindnoroot.exp | 121 | ./fscheck-bindnoroot.exp |
122 | 122 | ||
diff --git a/test/fs/private-cache.exp b/test/fs/private-cache.exp index 0a1f00eb5..ddff2d02d 100755 --- a/test/fs/private-cache.exp +++ b/test/fs/private-cache.exp | |||
@@ -21,10 +21,10 @@ expect { | |||
21 | } | 21 | } |
22 | sleep 1 | 22 | sleep 1 |
23 | 23 | ||
24 | send -- "ls ~/.cache | wc -l\r" | 24 | send -- "ls -l ~/.cache\r" |
25 | expect { | 25 | expect { |
26 | timeout {puts "TESTING ERROR 2\n";exit} | 26 | timeout {puts "TESTING ERROR 2\n";exit} |
27 | "\n0" | 27 | "total 0" |
28 | } | 28 | } |
29 | after 100 | 29 | after 100 |
30 | 30 | ||
@@ -43,7 +43,7 @@ after 100 | |||
43 | send -- "firejail --noprofile --private --private-cache\r" | 43 | send -- "firejail --noprofile --private --private-cache\r" |
44 | expect { | 44 | expect { |
45 | timeout {puts "TESTING ERROR 4\n";exit} | 45 | timeout {puts "TESTING ERROR 4\n";exit} |
46 | "tmpfs not mounted" | 46 | "Warning" |
47 | } | 47 | } |
48 | sleep 1 | 48 | sleep 1 |
49 | 49 | ||
diff --git a/test/fs/readonly-whitelist.exp b/test/fs/whitelist-readonly.exp index 784fc36bd..784fc36bd 100755 --- a/test/fs/readonly-whitelist.exp +++ b/test/fs/whitelist-readonly.exp | |||
diff --git a/test/fs/whitelist-whitespace.exp b/test/fs/whitelist-whitespace.exp index b16668557..959fb9409 100755 --- a/test/fs/whitelist-whitespace.exp +++ b/test/fs/whitelist-whitespace.exp | |||
@@ -14,13 +14,6 @@ expect { | |||
14 | } | 14 | } |
15 | sleep 1 | 15 | sleep 1 |
16 | 16 | ||
17 | send -- "ls ~ | wc -l\r" | ||
18 | expect { | ||
19 | timeout {puts "TESTING ERROR 2\n";exit} | ||
20 | "\n1" | ||
21 | } | ||
22 | after 100 | ||
23 | |||
24 | send -- "ls ~\r" | 17 | send -- "ls ~\r" |
25 | expect { | 18 | expect { |
26 | timeout {puts "TESTING ERROR 3\n";exit} | 19 | timeout {puts "TESTING ERROR 3\n";exit} |