From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Mon, 28 Nov 2022 16:06:57 +0000 (+0100)
Subject: fix test and code to not stop on case clash errors
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~102^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=af49e1079a854d770e719d425396499b5ae88592;p=nextcloud-desktop.git

fix test and code to not stop on case clash errors

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---

diff --git a/src/libsync/propagatorjobs.cpp b/src/libsync/propagatorjobs.cpp
index 8002f31e4..a04dc92c4 100644
--- a/src/libsync/propagatorjobs.cpp
+++ b/src/libsync/propagatorjobs.cpp
@@ -178,7 +178,7 @@ void PropagateLocalMkdir::startLocalMkdir()
 
     if (Utility::fsCasePreserving() && propagator()->localFileNameClash(_item->_file)) {
         qCWarning(lcPropagateLocalMkdir) << "New folder to create locally already exists with different case:" << _item->_file;
-        done(SyncFileItem::NormalError, tr("Attention, possible case sensitivity clash with %1").arg(newDirStr));
+        done(SyncFileItem::FileNameClash, tr("Attention, possible case sensitivity clash with %1").arg(newDirStr));
         return;
     }
     emit propagator()->touchedFile(newDirStr);
diff --git a/test/testsyncengine.cpp b/test/testsyncengine.cpp
index a0b2ae384..f3fdd704e 100644
--- a/test/testsyncengine.cpp
+++ b/test/testsyncengine.cpp
@@ -1287,20 +1287,20 @@ private slots:
     {
         FakeFolder fakeFolder{ FileInfo{} };
         fakeFolder.remoteModifier().mkdir("A");
+        fakeFolder.remoteModifier().mkdir("toDelete");
         fakeFolder.remoteModifier().insert("A/file");
 
         QVERIFY(fakeFolder.syncOnce());
         QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
 
         fakeFolder.remoteModifier().insert("A/FILE");
-        QVERIFY(!fakeFolder.syncOnce());
+        QVERIFY(fakeFolder.syncOnce());
 
-        fakeFolder.remoteModifier().mkdir("B");
-        fakeFolder.remoteModifier().rename("A/file", "B/file");
-        fakeFolder.remoteModifier().remove("A");
+        fakeFolder.remoteModifier().mkdir("a");
+        fakeFolder.remoteModifier().remove("toDelete");
 
-        QVERIFY(!fakeFolder.syncOnce());
-        auto folderA = fakeFolder.currentLocalState().find("A");
+        QVERIFY(fakeFolder.syncOnce());
+        auto folderA = fakeFolder.currentLocalState().find("toDelete");
         QCOMPARE(folderA, nullptr);
     }
 };