Feeling stupid for this basic error

pull/84/head
deajan 8 years ago
parent b8cf2e2694
commit a3c5df9a85

@ -511,7 +511,7 @@ function test_softdeletion_cleanup () {
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"
@ -526,7 +526,7 @@ 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
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

Loading…
Cancel
Save