From b8090a134dd4451cd6fece20465bd015697b698a Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 8 Jan 2014 12:55:58 +0100 Subject: [PATCH] Add test for issue 1329 --- tests/ownCloud/t1.pl | 30 +++++++++++++++++++- tests/ownCloud/toremote1/rtl1/rtl11/file.txt | 1 + 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 tests/ownCloud/toremote1/rtl1/rtl11/file.txt diff --git a/tests/ownCloud/t1.pl b/tests/ownCloud/t1.pl index e81f8fb92d..feb09f6f04 100755 --- a/tests/ownCloud/t1.pl +++ b/tests/ownCloud/t1.pl @@ -78,9 +78,10 @@ assertLocalAndRemoteDir( 'fromLocal1', 0); # remove a local dir printInfo( "Remove a local directory."); -localCleanup( localDir() . 'remoteToLocal1/rtlX' ); +localCleanup( 'remoteToLocal1/rtlX' ); csync(); assertLocalAndRemoteDir( 'fromLocal1', 0); +assert( ! -e localDir().'remoteToLocal1/rtlX' ); # create a false conflict, only the mtimes are changed, by content are equal. printInfo( "Create a false conflict."); @@ -105,6 +106,33 @@ assert( $localMD5 eq $realMD5 ); assert( glob(localDir().'remoteToLocal1/kernelcrash_conflict-*.txt' ) ); +# prepare test for issue 1329, rtlX need to be modified +# [https://github.com/owncloud/mirall/issues/1329] +printInfo( "Add a local directory"); +system("cp -r 'toremote1/rtl1/' '" . localDir(). "remoteToLocal1/rtlX'"); +csync(); +assertLocalAndRemoteDir( 'fromLocal1', 0); + +# remove a local dir (still for issue 1329) +printInfo( "Remove that directory."); +localCleanup( 'remoteToLocal1/rtlX' ); +csync(); +assertLocalAndRemoteDir( 'fromLocal1', 0); +assert( ! -e localDir().'remoteToLocal1/rtlX' ); + + +# add it back again (still for issue 1329) +printInfo( "Add back the local dir."); +system("cp -r 'toremote1/rtl1/' '" . localDir(). "remoteToLocal1/rtlX'"); +assert( -e localDir().'remoteToLocal1/rtlX' ); +assert( -e localDir().'remoteToLocal1/rtlX/rtl11/file.txt' ); +csync(); +assertLocalAndRemoteDir( 'fromLocal1', 0); +assert( -e localDir().'remoteToLocal1/rtlX' ); +assert( -e localDir().'remoteToLocal1/rtlX/rtl11/file.txt' ); + + + # ================================================================== cleanup(); diff --git a/tests/ownCloud/toremote1/rtl1/rtl11/file.txt b/tests/ownCloud/toremote1/rtl1/rtl11/file.txt new file mode 100644 index 0000000000..3b7d77338c --- /dev/null +++ b/tests/ownCloud/toremote1/rtl1/rtl11/file.txt @@ -0,0 +1 @@ +hello Olivier