1 files changed, 8 insertions, 2 deletions
diff --git a/test/testutils/syncenginetestutils.cpp b/test/testutils/syncenginetestutils.cpp
index c7e65ed82..ff8661ba3 100644
--- a/test/testutils/syncenginetestutils.cpp
+++ b/test/testutils/syncenginetestutils.cpp
@@ -1091,6 +1091,11 @@ void FakeFolder::fromDisk(QDir &dir, FileInfo &templateFi)
 {
     const auto infoList = dir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot);
     for (const auto &diskChild : infoList) {
+        if (diskChild.isHidden() || diskChild.fileName().startsWith(QStringLiteral(".sync_"))) {
+            // Skip system files, sqlite db files, sync log, etc.
+            continue;
+        }
+
         if (diskChild.isDir()) {
             QDir subDir = dir;
             subDir.cd(diskChild.fileName());
@@ -1112,9 +1117,10 @@ void FakeFolder::fromDisk(QDir &dir, FileInfo &templateFi)
                 auto content = f.read(1);
                 if (content.size() == 0) {
                     qWarning() << "Empty file at:" << diskChild.filePath();
-                    continue;
+                    fi.contentChar = FileInfo::DefaultContentChar;
+                } else {
+                    fi.contentChar = content.at(0);
                 }
-                fi.contentChar = content.at(0);
                 fi.contentSize = fi.fileSize;
             }