aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLibravatar Reiner Herrmann <reiner@reiner-h.de>2017-04-16 22:40:12 +0200
committerLibravatar Reiner Herrmann <reiner@reiner-h.de>2017-04-16 22:54:04 +0200
commit473467580b0387eaaa685446b88ffe363a8c8aa7 (patch)
tree33761f4a68604b07415a03f7b4a72a4cd91f879a /test
parentdon't fail after mkdir when directory exists (diff)
downloadfirejail-473467580b0387eaaa685446b88ffe363a8c8aa7.tar.gz
firejail-473467580b0387eaaa685446b88ffe363a8c8aa7.tar.zst
firejail-473467580b0387eaaa685446b88ffe363a8c8aa7.zip
test: sort output or the order is readdir() dependent
Diffstat (limited to 'test')
-rwxr-xr-xtest/fs/mkdir_mkfile.exp10
-rwxr-xr-xtest/fs/private-home-dir.exp10
-rwxr-xr-xtest/fs/private.exp8
3 files changed, 14 insertions, 14 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}
17sleep 1 17sleep 1
18 18
19send -- "find ~\r" 19send -- "find ~ | LC_ALL=C sort\r"
20expect {
21 timeout {puts "TESTING ERROR 1\n";exit}
22 "_firejail_test_file"
23}
24expect { 20expect {
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}
40expect {
41 timeout {puts "TESTING ERROR 1\n";exit}
42 "_firejail_test_file"
43}
44after 100 44after 100
45send -- "exit\r" 45send -- "exit\r"
46after 100 46after 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}
42after 100 42after 100
43 43
44send -- "ls -al ~\r" 44send -- "find ~ | LC_ALL=C sort\r"
45expect {
46 timeout {puts "TESTING ERROR 4\n";exit}
47 ".Xauthority"
48}
45expect { 49expect {
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}
53expect {
54 timeout {puts "TESTING ERROR 4\n";exit}
55 ".Xauthority"
56}
57after 100 57after 100
58 58
59send -- "exit\r" 59send -- "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}
38after 100 38after 100
39 39
40send -- "ls -al ~\r" 40send -- "find ~ | LC_ALL=C sort\r"
41expect { 41expect {
42 timeout {puts "TESTING ERROR 2\n";exit} 42 timeout {puts "TESTING ERROR 2\n";exit}
43 ".asoundrc" 43 ".Xauthority"
44} 44}
45expect { 45expect {
46 timeout {puts "TESTING ERROR 3\n";exit} 46 timeout {puts "TESTING ERROR 3\n";exit}
47 ".bashrc" 47 ".asoundrc"
48} 48}
49expect { 49expect {
50 timeout {puts "TESTING ERROR 4\n";exit} 50 timeout {puts "TESTING ERROR 4\n";exit}
51 ".Xauthority" 51 ".bashrc"
52} 52}
53after 100 53after 100
54 54