From: Olivier Goffart <ogoffart@woboq.com>
Date: Thu, 6 Feb 2020 10:04:04 +0000 (+0100)
Subject: fixup test
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~135
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a6a0e361c13028655c796df087f8c5e275dd3c53;p=nextcloud-desktop.git

fixup test
---

diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
index 3cd1f3e34..37c01c04a 100644
--- a/src/libsync/discoveryphase.cpp
+++ b/src/libsync/discoveryphase.cpp
@@ -167,6 +167,7 @@ QPair<bool, QByteArray> DiscoveryPhase::findAndCancelDeletedJob(const QString &o
         (*it)->_instruction = CSYNC_INSTRUCTION_NONE;
         result = true;
         oldEtag = (*it)->_etag;
+        _deletedItem.erase(it);
     }
     if (auto *otherJob = _queuedDeletedDirectories.take(originalPath)) {
         oldEtag = otherJob->_dirItem->_etag;
diff --git a/test/testsyncmove.cpp b/test/testsyncmove.cpp
index a51eaab8e..7925e3beb 100644
--- a/test/testsyncmove.cpp
+++ b/test/testsyncmove.cpp
@@ -833,7 +833,6 @@ private slots:
         QVERIFY(fakeFolder.currentRemoteState().find("C/b1"));
         QVERIFY(fakeFolder.currentRemoteState().find("A/b2"));
         QVERIFY(fakeFolder.currentRemoteState().find("C/b2"));
-        qDebug() << counter.nMOVE << counter.nDELETE << counter.nGET << counter.nPUT;
         QCOMPARE(counter.nMOVE, 0); // Unfortunately, we can't really make a move in this case
         QCOMPARE(counter.nGET, 2);
         QCOMPARE(counter.nPUT, 2);