diff options
author | Reiner Herrmann <reiner@reiner-h.de> | 2017-04-16 22:40:12 +0200 |
---|---|---|
committer | Reiner Herrmann <reiner@reiner-h.de> | 2017-04-16 22:54:04 +0200 |
commit | 473467580b0387eaaa685446b88ffe363a8c8aa7 (patch) | |
tree | 33761f4a68604b07415a03f7b4a72a4cd91f879a | |
parent | don't fail after mkdir when directory exists (diff) | |
download | firejail-473467580b0387eaaa685446b88ffe363a8c8aa7.tar.gz firejail-473467580b0387eaaa685446b88ffe363a8c8aa7.tar.zst firejail-473467580b0387eaaa685446b88ffe363a8c8aa7.zip |
test: sort output or the order is readdir() dependent
-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 |
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 | } |
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 | ||