fixup test

diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
index 3cd1f3e3410908078c567f577cc5b1c15bb2c9ec..37c01c04a6b19f20a9dfc3ecf6a5db9eb39efb24 100644 (file)
--- 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 a51eaab8e722f477eac111323e601c66739c3922..7925e3beb1b785c797b1633c5b8cd73d679ce2b0 100644 (file)
--- 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);