diff options
author | Christian Kamm <mail@ckamm.de> | 2018-12-18 12:10:19 +0300 |
---|---|---|
committer | ckamm <mail@ckamm.de> | 2018-12-19 12:14:25 +0300 |
commit | 5211d9a8b1cade64d6f9123ada0dd08b38f30735 (patch) | |
tree | e642aa1ed03119227ef1380618d1cb5555b0e8f7 /test | |
parent | e97d42933efb102cfbf7d14f0495a333e028dfa8 (diff) |
Database: Change path for new dbs to .sync_* #5904
This is to avoid issues on OSX, where the ._ prefix has special meaning.
Originally (before 2.3.2) ._ was necessary to guarantee exclusion. But
since then the .sync_ prefix is excluded as well.
This does not affect existing database files.
Diffstat (limited to 'test')
-rw-r--r-- | test/scripts/txpl/ownCloud/Test.pm | 2 | ||||
-rwxr-xr-x | test/scripts/txpl/t2.pl | 2 | ||||
-rwxr-xr-x | test/scripts/txpl/t6.pl | 2 | ||||
-rw-r--r-- | test/syncenginetestutils.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/scripts/txpl/ownCloud/Test.pm b/test/scripts/txpl/ownCloud/Test.pm index e5964dc9c..3cbac70b8 100644 --- a/test/scripts/txpl/ownCloud/Test.pm +++ b/test/scripts/txpl/ownCloud/Test.pm @@ -455,7 +455,7 @@ sub traverse( $$;$ ) $isHere = 1 if( $acceptConflicts && !$isHere && $f =~ /conflicted copy/ ); $isHere = 1 if( $f =~ /\.csync/ ); - $isHere = 1 if( $f =~ /\._sync_/ ); + $isHere = 1 if( $f =~ /\.sync_/ ); assert( $isHere, "Filename local, but not remote: $f" ); } diff --git a/test/scripts/txpl/t2.pl b/test/scripts/txpl/t2.pl index 304c8f301..dd1234654 100755 --- a/test/scripts/txpl/t2.pl +++ b/test/scripts/txpl/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() . "._sync_*.db \"UPDATE metadata SET fileid='';\""); +system( "sqlite3 " . localDir() . ".sync_*.db \"UPDATE metadata SET fileid='';\""); #refresh the ids csync(); assertLocalAndRemoteDir( 'remoteToLocal1', 1); diff --git a/test/scripts/txpl/t6.pl b/test/scripts/txpl/t6.pl index 2b97c44f1..2b9fbb1e5 100755 --- a/test/scripts/txpl/t6.pl +++ b/test/scripts/txpl/t6.pl @@ -61,7 +61,7 @@ sub getETagFromJournal($$) { my ($name,$num) = @_; - my $sql = "sqlite3 " . localDir() . "._sync_*.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/test/syncenginetestutils.h b/test/syncenginetestutils.h index 44f117b06..52a0de41b 100644 --- a/test/syncenginetestutils.h +++ b/test/syncenginetestutils.h @@ -1134,7 +1134,7 @@ public: _account->setDavDisplayName("fakename"); _account->setServerVersion("10.0.0"); - _journalDb.reset(new OCC::SyncJournalDb(localPath() + "._sync_test.db")); + _journalDb.reset(new OCC::SyncJournalDb(localPath() + ".sync_test.db")); _syncEngine.reset(new OCC::SyncEngine(_account, localPath(), "", _journalDb.get())); // Ignore temporary files from the download. (This is in the default exclude list, but we don't load it) _syncEngine->excludedFiles().addManualExclude("]*.~*"); |