From 8a70d22af778c84dc3aece2a1e698b9da3ef5fea Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 20 Jan 2017 14:38:21 +0100 Subject: [PATCH] ChunkingNG: Add some tests - Test that we recover correctly if the chunks were removed on the server. - Test changing the file localy while uploading. --- test/syncenginetestutils.h | 12 +++++++- test/testchunkingng.cpp | 59 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/test/syncenginetestutils.h b/test/syncenginetestutils.h index f33096352..a4a12884f 100644 --- a/test/syncenginetestutils.h +++ b/test/syncenginetestutils.h @@ -315,7 +315,10 @@ public: QString fileName = getFilePathFromUrl(request.url()); Q_ASSERT(!fileName.isNull()); // for root, it should be empty const FileInfo *fileInfo = remoteRootFileInfo.find(fileName); - Q_ASSERT(fileInfo); + if (!fileInfo) { + QMetaObject::invokeMethod(this, "respond404", Qt::QueuedConnection); + return; + } QString prefix = request.url().path().left(request.url().path().size() - fileName.size()); // Don't care about the request and just return a full propfind @@ -375,6 +378,13 @@ public: emit finished(); } + Q_INVOKABLE void respond404() { + setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 404); + setError(InternalServerError, "Not Found"); + emit metaDataChanged(); + emit finished(); + } + void abort() override { } qint64 bytesAvailable() const override { return payload.size() + QIODevice::bytesAvailable(); } diff --git a/test/testchunkingng.cpp b/test/testchunkingng.cpp index ce7bbe278..ed30f8954 100644 --- a/test/testchunkingng.cpp +++ b/test/testchunkingng.cpp @@ -178,6 +178,65 @@ private slots: QCOMPARE(fakeFolder.uploadState().children.count(), 0); // The last sync cleaned the chunks } + void testModifyLocalFileWhileUploading() { + + FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()}; + fakeFolder.syncEngine().account()->setCapabilities({ { "dav", QVariantMap{ {"chunking", "1.0"} } } }); + const int size = 150 * 1000 * 1000; // 150 MB + + fakeFolder.localModifier().insert("A/a0", size); + + // middle of the sync, modify the file + QMetaObject::Connection con = QObject::connect(&fakeFolder.syncEngine(), &SyncEngine::transmissionProgress, + [&](const ProgressInfo &progress) { + if (progress.completedSize() > (progress.totalSize() / 2 )) { + fakeFolder.localModifier().setContents("A/a0", 'B'); + fakeFolder.localModifier().appendByte("A/a0"); + QObject::disconnect(con); + } + }); + + QVERIFY(!fakeFolder.syncOnce()); + + // There should be a followup sync + QCOMPARE(fakeFolder.syncEngine().isAnotherSyncNeeded(), ImmediateFollowUp); + + QCOMPARE(fakeFolder.uploadState().children.count(), 1); // We did not clean the chunks at this point + auto chunkingId = fakeFolder.uploadState().children.first().name; + + // Now we make a new sync which should upload the file for good. + QVERIFY(fakeFolder.syncOnce()); + + QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState()); + QCOMPARE(fakeFolder.currentRemoteState().find("A/a0")->size, size+1); + + // A different chunk id was used, and the previous one is removed + QCOMPARE(fakeFolder.uploadState().children.count(), 1); + QVERIFY(fakeFolder.uploadState().children.first().name != chunkingId); + } + + + void testResumeServerDeletedChunks() { + + FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()}; + fakeFolder.syncEngine().account()->setCapabilities({ { "dav", QVariantMap{ {"chunking", "1.0"} } } }); + const int size = 300 * 1000 * 1000; // 300 MB + partialUpload(fakeFolder, "A/a0", size); + QCOMPARE(fakeFolder.uploadState().children.count(), 1); + auto chunkingId = fakeFolder.uploadState().children.first().name; + + // Delete the chunks on the server + fakeFolder.uploadState().children.clear(); + QVERIFY(fakeFolder.syncOnce()); + + QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState()); + QCOMPARE(fakeFolder.currentRemoteState().find("A/a0")->size, size); + + // A different chunk id was used + QCOMPARE(fakeFolder.uploadState().children.count(), 1); + QVERIFY(fakeFolder.uploadState().children.first().name != chunkingId); + } + }; QTEST_GUILESS_MAIN(TestChunkingNG)