mirror of
https://github.com/chylex/Nextcloud-Desktop.git
synced 2024-11-26 22:42:44 +01:00
d76e0ec6d8
Previously this wasn't happening for errors that were not NormalErrors because they don't end up in the blacklist. This revises the resetting logic to be independent of the error blacklist and make use of UploadInfo::errorCount instead. 412 errors should reset chunked uploads because they might be indicative of a checksum error. Additionally, server bugs might require that additional errors cause an upload reset. To allow that, a new capability is added that can be used to advise the client about this.
76 lines
2.5 KiB
C++
76 lines
2.5 KiB
C++
/*
|
|
* This software is in the public domain, furnished "as is", without technical
|
|
* support, and with no warranty, express or implied, as to its usefulness for
|
|
* any purpose.
|
|
*
|
|
*/
|
|
|
|
#include <QtTest>
|
|
#include "syncenginetestutils.h"
|
|
#include <syncengine.h>
|
|
#include <syncjournaldb.h>
|
|
|
|
using namespace OCC;
|
|
|
|
class TestUploadReset : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
private slots:
|
|
|
|
// Verify that the chunked transfer eventually gets reset with the new chunking
|
|
void testFileUploadNg() {
|
|
FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
|
|
|
|
fakeFolder.syncEngine().account()->setCapabilities({ { "dav", QVariantMap{
|
|
{"chunking", "1.0"},
|
|
{"httpErrorCodesThatResetFailingChunkedUploads", QVariantList{500} } } } });
|
|
|
|
const int size = 100 * 1000 * 1000; // 100 MB
|
|
fakeFolder.localModifier().insert("A/a0", size);
|
|
QDateTime modTime = QDateTime::currentDateTime();
|
|
fakeFolder.localModifier().setModTime("A/a0", modTime);
|
|
|
|
// Create a transfer id, so we can make the final MOVE fail
|
|
SyncJournalDb::UploadInfo uploadInfo;
|
|
uploadInfo._transferid = 1;
|
|
uploadInfo._valid = true;
|
|
uploadInfo._modtime = modTime;
|
|
fakeFolder.syncEngine().journal()->setUploadInfo("A/a0", uploadInfo);
|
|
|
|
fakeFolder.uploadState().mkdir("1");
|
|
fakeFolder.serverErrorPaths().append("1/.file");
|
|
|
|
QVERIFY(!fakeFolder.syncOnce());
|
|
|
|
uploadInfo = fakeFolder.syncEngine().journal()->getUploadInfo("A/a0");
|
|
QCOMPARE(uploadInfo._errorCount, 1);
|
|
QCOMPARE(uploadInfo._transferid, 1);
|
|
|
|
fakeFolder.syncEngine().journal()->wipeErrorBlacklist();
|
|
QVERIFY(!fakeFolder.syncOnce());
|
|
|
|
uploadInfo = fakeFolder.syncEngine().journal()->getUploadInfo("A/a0");
|
|
QCOMPARE(uploadInfo._errorCount, 2);
|
|
QCOMPARE(uploadInfo._transferid, 1);
|
|
|
|
fakeFolder.syncEngine().journal()->wipeErrorBlacklist();
|
|
QVERIFY(!fakeFolder.syncOnce());
|
|
|
|
uploadInfo = fakeFolder.syncEngine().journal()->getUploadInfo("A/a0");
|
|
QCOMPARE(uploadInfo._errorCount, 3);
|
|
QCOMPARE(uploadInfo._transferid, 1);
|
|
|
|
fakeFolder.syncEngine().journal()->wipeErrorBlacklist();
|
|
QVERIFY(!fakeFolder.syncOnce());
|
|
|
|
uploadInfo = fakeFolder.syncEngine().journal()->getUploadInfo("A/a0");
|
|
QCOMPARE(uploadInfo._errorCount, 0);
|
|
QCOMPARE(uploadInfo._transferid, 0);
|
|
QVERIFY(!uploadInfo._valid);
|
|
}
|
|
};
|
|
|
|
QTEST_GUILESS_MAIN(TestUploadReset)
|
|
#include "testuploadreset.moc"
|