Fix perl tests for sync journal db name

diff --git a/csync/tests/ownCloud/ownCloud/Test.pm b/csync/tests/ownCloud/ownCloud/Test.pm
index 691b276d493a0843a1404a8ff47ed7db4534894a..ee3d557294b9d3f2ae892ddf6b14387b308af18b 100644 (file)
--- a/csync/tests/ownCloud/ownCloud/Test.pm
+++ b/csync/tests/ownCloud/ownCloud/Test.pm
@@ -457,6 +457,7 @@ sub traverse( $$;$ )
 
        $isHere = 1 if( $acceptConflicts && !$isHere && $f =~ /_conflict/ );
        $isHere = 1 if( $f =~ /\.csync/ );
+       $isHere = 1 if( $f =~ /\._sync_/ );
        assert( $isHere, "Filename local, but not remote: $f" );
     }
 

diff --git a/csync/tests/ownCloud/t2.pl b/csync/tests/ownCloud/t2.pl
index 6358bf08d95076872216ad03f44fc1de2b25405e..304c8f30153a2669276a8b337454101e2fc9cc24 100755 (executable)
--- a/csync/tests/ownCloud/t2.pl
+++ b/csync/tests/ownCloud/t2.pl
@@ -176,7 +176,7 @@ assertLocalAndRemoteDir( 'remoteToLocal1', 1);
 
 printInfo("simulate a owncloud 5 update by removing all the fileid");
 ## simulate a owncloud 5 update by removing all the fileid
-system( "sqlite3 " . localDir() . ".csync_journal.db \"UPDATE metadata SET fileid='';\"");
+system( "sqlite3 " . localDir() . "._sync_*.db \"UPDATE metadata SET fileid='';\"");
 #refresh the ids
 csync();
 assertLocalAndRemoteDir( 'remoteToLocal1', 1);

diff --git a/csync/tests/ownCloud/t6.pl b/csync/tests/ownCloud/t6.pl
index 5e456112f0eaa1e2c4edb4b301698601d117ac96..cc9f73e7cd38b43148e703715aadf992ba39f150 100755 (executable)
--- a/csync/tests/ownCloud/t6.pl
+++ b/csync/tests/ownCloud/t6.pl
@@ -61,7 +61,7 @@ sub getETagFromJournal($$)
 {
     my ($name,$num) = @_;
 
-    my $sql = "sqlite3 " . localDir() . ".csync_journal.db \"SELECT md5 FROM metadata WHERE path='$name';\"";
+    my $sql = "sqlite3 " . localDir() . "._sync_*.db \"SELECT md5 FROM metadata WHERE path='$name';\"";
     open(my $fh, '-|', $sql) or die $!;
     my $etag  = <$fh>;
     close $fh;

diff --git a/csync/tests/ownCloud/t7.pl b/csync/tests/ownCloud/t7.pl
index ba4d70e805f2f391925ffd048a0534ccc2af7983..117b998fe80d91fd67aa69d1109967e14e7ffa71 100755 (executable)
--- a/csync/tests/ownCloud/t7.pl
+++ b/csync/tests/ownCloud/t7.pl
@@ -37,8 +37,8 @@ sub assertCsyncJournalOk {
        my $path = $_[0];
 
     # FIXME: should test also remoteperm but it's not working with owncloud6
-    #     my $cmd = 'sqlite3 ' . $path . '.csync_journal.db "SELECT count(*) from metadata where length(remotePerm) == 0 or length(fileId) == 0"';
-    my $cmd = 'sqlite3 ' . $path . '.csync_journal.db "SELECT count(*) from metadata where length(fileId) == 0"';
+    #     my $cmd = 'sqlite3 ' . $path . '._sync_*.db "SELECT count(*) from metadata where length(remotePerm) == 0 or length(fileId) == 0"';
+    my $cmd = 'sqlite3 ' . $path . '._sync_*.db "SELECT count(*) from metadata where length(fileId) == 0"';
        my $result = `$cmd`;
        assert($result == "0");
 }
@@ -170,14 +170,14 @@ assertLocalAndRemoteDir( '', 0);
 
 #######################################################################
 printInfo( "move a directory in a outside read only folder" );
-system("sqlite3 " . localDir().'.csync_journal.db .dump');
+system("sqlite3 " . localDir().'._sync_*.db .dump');
 
 #Missing directory should be restored
 #new directory should be uploaded
 system("mv " . localDir().'readonlyDirectory_PERM_M_/subdir_PERM_CK_ ' . localDir().'normalDirectory_PERM_CKDNV_/subdir_PERM_CKDNV_'  );
 
 csync();
-system("sqlite3 " . localDir().'.csync_journal.db .dump');
+system("sqlite3 " . localDir().'._sync_*.db .dump');
 assertCsyncJournalOk(localDir());
 
 # old name restored
@@ -229,7 +229,7 @@ system("rm -r " . localDir(). "readonlyDirectory_PERM_M_/moved_PERM_CK_");
 
 assertLocalAndRemoteDir( '', 0);
 
-system("sqlite3 " . localDir().'.csync_journal.db .dump');
+system("sqlite3 " . localDir().'._sync_*.db .dump');
 
 
 #######################################################################