From 070d7b7e3aa0380049f8afdcfd0ca65e79044c5e Mon Sep 17 00:00:00 2001 From: deajan Date: Mon, 21 Nov 2016 19:13:15 +0100 Subject: [PATCH] Wow... fixed the fix that should have fixed the bug --- dev/tests/run_tests.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dev/tests/run_tests.sh b/dev/tests/run_tests.sh index 2fcde48..81fc5e7 100755 --- a/dev/tests/run_tests.sh +++ b/dev/tests/run_tests.sh @@ -5,7 +5,7 @@ ## On Mac OSX, this needs to be run as root in order to use sudo without password ## From current terminal run sudo -s in order to get a new terminal as root -# osync test suite 2016112106 +# osync test suite 2016112107 # 4 tests: # quicklocal @@ -511,10 +511,10 @@ function test_softdeletion_cleanup () { touch "$file.new" - if [ "$TRAVIS_RUN" != true ] && [ "$LOCAL_OS" != "BSD" ] && [ "$LOCAL_OS" != "MacOSX" ]; then - CreateOldFile "$file.old" - else + if [ "$TRAVIS_RUN" == true ] || [ "$LOCAL_OS" == "BSD" ] || [ "$LOCAL_OS" == "MacOSX" ]; then echo "Skipping changing ctime on file because travis / bsd / macos does not support debugfs" + else + CreateOldFile "$file.old" fi done @@ -526,12 +526,12 @@ function test_softdeletion_cleanup () { [ -f "$file.new" ] assertEquals "New softdeleted / backed up file [$file.new] exists." "0" $? - if [ "$TRAVIS_RUN" != true ] && [ "$LOCAL_OS" != "BSD" ] && [ "$LOCAL_OS" != "MacOSX" ]; then - [ ! -f "$file.old" ] - assertEquals "Old softdeleted / backed up file [$file.old] is deleted permanently." "1" $? - else + if [ "$TRAVIS_RUN" == true ] && [ "$LOCAL_OS" == "BSD" ] && [ "$LOCAL_OS" == "MacOSX" ]; then [ ! -f "$file.old" ] assertEquals "Old softdeleted / backed up file [$file.old] is deleted permanently." "0" $? + else + [ ! -f "$file.old" ] + assertEquals "Old softdeleted / backed up file [$file.old] is deleted permanently." "1" $? fi done done