WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved unit tests for soft deletion directories

This commit is contained in:
deajan 2016-12-12 23:58:42 +01:00
parent 68d0306713
commit 36bcaecc74
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dev/tests/run_tests.sh
View File

@ -7,7 +7,7 @@
## On CYGWIN / MSYS, ACL and extended attributes aren't supported ## On CYGWIN / MSYS, ACL and extended attributes aren't supported
# osync test suite 2016121201 # osync test suite 2016121202
# 4 tests: # 4 tests:
# quicklocal # quicklocal
@ -151,8 +151,15 @@ function DownloadLargeFileSet() {
function CreateOldFile () { function CreateOldFile () {
local drive local drive
local filePath="${1}" local filePath="${1}"
local type="${2:-false}"
if [ $type == true ]; then
mkdir -p "$filePath"
else
mkdir -p "$(dirname $filePath)"
touch "$filePath" touch "$filePath"
fi
assertEquals "touch [$filePath]" "0" $? assertEquals "touch [$filePath]" "0" $?
# Get current drive # Get current drive
@ -720,13 +727,16 @@ function test_softdeletion_cleanup () {
files[2]="$INITIATOR_DIR/$OSYNC_BACKUP_DIR/someBackedUpFileInitiator" files[2]="$INITIATOR_DIR/$OSYNC_BACKUP_DIR/someBackedUpFileInitiator"
files[3]="$TARGET_DIR/$OSYNC_BACKUP_DIR/someBackedUpFileTarget" files[3]="$TARGET_DIR/$OSYNC_BACKUP_DIR/someBackedUpFileTarget"
DirA="$INITIATOR_DIR/$OSYNC_DELETE_DIR/somedir"
DirB="$TARGET_DIR/$OSYNC_DELETE_DIR/someotherdir"
for i in "${osyncParameters[@]}"; do for i in "${osyncParameters[@]}"; do
cd "$OSYNC_DIR" cd "$OSYNC_DIR"
PrepareLocalDirs PrepareLocalDirs
# First run # First run
REMOTE_HOST_PING=no ./$OSYNC_EXECUTABLE $i #REMOTE_HOST_PING=no ./$OSYNC_EXECUTABLE $i
assertEquals "First deletion run with parameters [$i]." "0" $? #assertEquals "First deletion run with parameters [$i]." "0" $?
# Get current drive # Get current drive
drive=$(df "$OSYNC_DIR" | tail -1 | awk '{print $1}') drive=$(df "$OSYNC_DIR" | tail -1 | awk '{print $1}')
@ -746,6 +756,12 @@ function test_softdeletion_cleanup () {
CreateOldFile "$file.old" CreateOldFile "$file.old"
fi fi
done done
if [ "$TRAVIS_RUN" == true ] || [ "$LOCAL_OS" == "BSD" ] || [ "$LOCAL_OS" == "MacOSX" ] || [ "$LOCAL_OS" == "WinNT10" ] || [ "$LOCAL_OS" == "msys" ] || [ "$LOCAL_OS" == "Cygwin" ]; then
echo "Skipping changing ctime on dir too"
else
CreateOldFile "$DirA" true
CreateOldFile "$DirB" true
fi
# Second run # Second run
REMOTE_HOST_PING=no ./$OSYNC_EXECUTABLE $i REMOTE_HOST_PING=no ./$OSYNC_EXECUTABLE $i
@ -763,6 +779,18 @@ function test_softdeletion_cleanup () {
assertEquals "Old softdeleted / backed up file [$file.old] is deleted permanently." "1" $? assertEquals "Old softdeleted / backed up file [$file.old] is deleted permanently." "1" $?
fi fi
done done
if [ "$TRAVIS_RUN" == true ] || [ "$LOCAL_OS" == "BSD" ] || [ "$LOCAL_OS" == "MacOSX" ] || [ "$LOCAL_OS" == "WinNT10" ] || [ "$LOCAL_OS" == "msys" ] || [ "$LOCAL_OS" == "Cygwin" ]; then
[ ! -d "$DirA" ]
assertEquals "Old softdeleted / backed up directory [$dirA] is deleted permanently." "0" $?
[ ! -d "$DirB" ]
assertEquals "Old softdeleted / backed up directory [$dirB] is deleted permanently." "0" $?
else
[ ! -d "$DirA" ]
assertEquals "Old softdeleted / backed up directory [$DirA] is deleted permanently." "1" $?
[ ! -d "$DirB" ]
assertEquals "Old softdeleted / backed up directory [$DirB] is deleted permanently." "1" $?
fi
done done
} }