From 473467580b0387eaaa685446b88ffe363a8c8aa7 Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Sun, 16 Apr 2017 22:40:12 +0200 Subject: test: sort output or the order is readdir() dependent --- test/fs/mkdir_mkfile.exp | 10 +++++----- test/fs/private-home-dir.exp | 10 +++++----- test/fs/private.exp | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'test/fs') 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 { } sleep 1 -send -- "find ~\r" -expect { - timeout {puts "TESTING ERROR 1\n";exit} - "_firejail_test_file" -} +send -- "find ~ | LC_ALL=C sort\r" expect { timeout {puts "TESTING ERROR 1\n";exit} "_firejail_test_dir" @@ -41,6 +37,10 @@ expect { timeout {puts "TESTING ERROR 1\n";exit} "_firejail_test_dir/dir1/dir2/dir3/file1" } +expect { + timeout {puts "TESTING ERROR 1\n";exit} + "_firejail_test_file" +} after 100 send -- "exit\r" 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 { } after 100 -send -- "ls -al ~\r" +send -- "find ~ | LC_ALL=C sort\r" +expect { + timeout {puts "TESTING ERROR 4\n";exit} + ".Xauthority" +} expect { timeout {puts "TESTING ERROR 2\n";exit} ".asoundrc" @@ -50,10 +54,6 @@ expect { timeout {puts "TESTING ERROR 3\n";exit} ".bashrc" } -expect { - timeout {puts "TESTING ERROR 4\n";exit} - ".Xauthority" -} after 100 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 { } after 100 -send -- "ls -al ~\r" +send -- "find ~ | LC_ALL=C sort\r" expect { timeout {puts "TESTING ERROR 2\n";exit} - ".asoundrc" + ".Xauthority" } expect { timeout {puts "TESTING ERROR 3\n";exit} - ".bashrc" + ".asoundrc" } expect { timeout {puts "TESTING ERROR 4\n";exit} - ".Xauthority" + ".bashrc" } after 100 -- cgit v1.2.3-54-g00ecf