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

Fixed softdeletion cleanup tests

This commit is contained in:
deajan 2016-11-13 16:23:04 +01:00
parent 4869e3e89a
commit 085a182ce6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dev/tests/run_tests.sh
View File

@ -122,7 +122,7 @@ function CreateOldFile () {
drive=$(df "$OSYNC_DIR" | tail -1 | awk '{print $1}') drive=$(df "$OSYNC_DIR" | tail -1 | awk '{print $1}')
# modify ctime on ext4 so osync thinks it has to delete the old files # modify ctime on ext4 so osync thinks it has to delete the old files
debugfs -w -R 'set_inode_field "$file.old" ctime 201001010101' $drive debugfs -w -R 'set_inode_field "'$filePath'" ctime 201001010101' $drive
assertEquals "CreateOldFile [$filePath]" "0" $? assertEquals "CreateOldFile [$filePath]" "0" $?
# force update of inodes (ctimes) # force update of inodes (ctimes)
@ -253,6 +253,7 @@ function test_softdeletion_cleanup () {
files[deletedFileSlave]="$TARGET_DIR/$OSYNC_DELETED_DIR/someDeletedFileSlave" files[deletedFileSlave]="$TARGET_DIR/$OSYNC_DELETED_DIR/someDeletedFileSlave"
files[backedUpFileMaster]="$INITIATOR_DIR/$OSYNC_BACKUP_DIR/someBackedUpFileMaster" files[backedUpFileMaster]="$INITIATOR_DIR/$OSYNC_BACKUP_DIR/someBackedUpFileMaster"
files[backedUpFileSlave]="$TARGET_DIR/$OSYNC_BACKUP_DIR/someBackedUpFileSlave" files[backedUpFileSlave]="$TARGET_DIR/$OSYNC_BACKUP_DIR/someBackedUpFileSlave"
for i in "${osyncParameters[@]}"; do for i in "${osyncParameters[@]}"; do
cd "$OSYNC_DIR" cd "$OSYNC_DIR"
PrepareLocalDirs PrepareLocalDirs
@ -285,10 +286,12 @@ function test_softdeletion_cleanup () {
for file in "${files[@]}"; do for file in "${files[@]}"; do
[ -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" $?
[ ! -f "$file.old" ]
if [ "$TRAVIS_RUN" != true ]; then if [ "$TRAVIS_RUN" != true ]; then
[ ! -f "$file.old" ]
assertEquals "Old softdeleted / backed up file [$file.old] is deleted permanently." "1" $? assertEquals "Old softdeleted / backed up file [$file.old] is deleted permanently." "1" $?
else else
[ ! -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" $?
fi fi
done done