Wow... fixed the fix that should have fixed the bug
This commit is contained in:
parent
66316b49be
commit
070d7b7e3a
|
@ -5,7 +5,7 @@
|
||||||
## On Mac OSX, this needs to be run as root in order to use sudo without password
|
## 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
|
## 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:
|
# 4 tests:
|
||||||
# quicklocal
|
# quicklocal
|
||||||
|
@ -511,10 +511,10 @@ function test_softdeletion_cleanup () {
|
||||||
|
|
||||||
touch "$file.new"
|
touch "$file.new"
|
||||||
|
|
||||||
if [ "$TRAVIS_RUN" != true ] && [ "$LOCAL_OS" != "BSD" ] && [ "$LOCAL_OS" != "MacOSX" ]; then
|
if [ "$TRAVIS_RUN" == true ] || [ "$LOCAL_OS" == "BSD" ] || [ "$LOCAL_OS" == "MacOSX" ]; then
|
||||||
CreateOldFile "$file.old"
|
|
||||||
else
|
|
||||||
echo "Skipping changing ctime on file because travis / bsd / macos does not support debugfs"
|
echo "Skipping changing ctime on file because travis / bsd / macos does not support debugfs"
|
||||||
|
else
|
||||||
|
CreateOldFile "$file.old"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
@ -526,12 +526,12 @@ function test_softdeletion_cleanup () {
|
||||||
[ -f "$file.new" ]
|
[ -f "$file.new" ]
|
||||||
assertEquals "New softdeleted / backed up file [$file.new] exists." "0" $?
|
assertEquals "New softdeleted / backed up file [$file.new] exists." "0" $?
|
||||||
|
|
||||||
if [ "$TRAVIS_RUN" != true ] && [ "$LOCAL_OS" != "BSD" ] && [ "$LOCAL_OS" != "MacOSX" ]; then
|
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
|
|
||||||
[ ! -f "$file.old" ]
|
[ ! -f "$file.old" ]
|
||||||
assertEquals "Old softdeleted / backed up file [$file.old] is deleted permanently." "0" $?
|
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
|
fi
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue