More test framework fixes (#12100)

Author: erikjv

src/libsync/httplogger.cpp

@@ -15,7 +15,6 @@
 #include "httplogger.h"
 
 #include "common/chronoelapsedtimer.h"
-#include "common/utility.h"
 
 #include <QBuffer>
 #include <QJsonArray>

test/testoauth.cpp

@@ -54,20 +54,29 @@ class FakePostReply : public QNetworkReply
         if (aborted) {
             setError(OperationCanceledError, QStringLiteral("Operation Canceled"));
             Q_EMIT metaDataChanged();
-            Q_EMIT finished();
+            checkedFinished();
             return;
         }
         setHeader(QNetworkRequest::ContentLengthHeader, payload->size());
         setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 200);
         Q_EMIT metaDataChanged();
         if (bytesAvailable())
             Q_EMIT readyRead();
-        Q_EMIT finished();
+        checkedFinished();
     }
 
     void abort() override {
         aborted = true;
     }
+
+    void checkedFinished()
+    {
+        if (!isFinished()) {
+            setFinished(true);
+            Q_EMIT finished();
+        }
+    }
+
     qint64 bytesAvailable() const override {
         if (aborted)
             return 0;

test/testutils/syncenginetestutils.cpp

@@ -418,18 +418,13 @@ FakePropfindReply::FakePropfindReply(FileInfo &remoteRootFileInfo, QNetworkAcces
 
 void FakePropfindReply::respond()
 {
-    if (isFinished()) {
-        return;
-    }
-
     setHeader(QNetworkRequest::ContentLengthHeader, payload.size());
     setHeader(QNetworkRequest::ContentTypeHeader, QByteArrayLiteral("application/xml; charset=utf-8"));
     setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 207);
-    setFinished(true);
     Q_EMIT metaDataChanged();
     if (bytesAvailable())
         Q_EMIT readyRead();
-    Q_EMIT finished();
+    checkedFinished();
 }
 
 void FakePropfindReply::respond404()
@@ -441,7 +436,7 @@ void FakePropfindReply::respond404()
     setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 404);
     setError(InternalServerError, QStringLiteral("Not Found"));
     Q_EMIT metaDataChanged();
-    Q_EMIT finished();
+    checkedFinished();
 }
 
 qint64 FakePropfindReply::bytesAvailable() const
@@ -495,7 +490,7 @@ void FakePutReply::respond()
     setRawHeader("X-OC-MTime", "accepted"); // Prevents Q_ASSERT(!_runningNow) since we'll call PropagateItemJob::done twice in that case.
     setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 200);
     Q_EMIT metaDataChanged();
-    Q_EMIT finished();
+    checkedFinished();
 }
 
 FakeMkcolReply::FakeMkcolReply(FileInfo &remoteRootFileInfo, QNetworkAccessManager::Operation op, const QNetworkRequest &request, QObject *parent)
@@ -523,8 +518,9 @@ void FakeMkcolReply::respond()
         setRawHeader("OC-FileId", fileInfo->fileId);
         setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 201);
         Q_EMIT metaDataChanged();
-        Q_EMIT finished();
     }
+
+    checkedFinished();
 }
 
 FakeDeleteReply::FakeDeleteReply(FileInfo &remoteRootFileInfo, QNetworkAccessManager::Operation op, const QNetworkRequest &request, QObject *parent)
@@ -545,7 +541,8 @@ void FakeDeleteReply::respond()
 {
     setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 204);
     Q_EMIT metaDataChanged();
-    Q_EMIT finished();
+
+    checkedFinished();
 }
 
 FakeMoveReply::FakeMoveReply(FileInfo &remoteRootFileInfo, QNetworkAccessManager::Operation op, const QNetworkRequest &request, QObject *parent)
@@ -569,8 +566,9 @@ void FakeMoveReply::respond()
     if (error() == QNetworkReply::NoError) {
         setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 201);
         Q_EMIT metaDataChanged();
-        Q_EMIT finished();
     }
+
+    checkedFinished();
 }
 
 FakeGetReply::FakeGetReply(FileInfo &remoteRootFileInfo, QNetworkAccessManager::Operation op, const QNetworkRequest &request, QObject *parent)
@@ -649,7 +647,7 @@ void FakeGetReply::respond()
                 Q_EMIT readyRead();
             }
         }
-        Q_EMIT finished();
+        checkedFinished();
     }
 }
 
@@ -698,8 +696,7 @@ void FakePayloadReply::respond()
         setHeader(QNetworkRequest::ContentLengthHeader, _body.size());
         Q_EMIT metaDataChanged();
         Q_EMIT readyRead();
-        setFinished(true);
-        Q_EMIT finished();
+        checkedFinished();
     }
 }
 
@@ -748,8 +745,7 @@ void FakeErrorReply::respond()
 
 void FakeErrorReply::slotSetFinished()
 {
-    setFinished(true);
-    Q_EMIT finished();
+    checkedFinished();
 }
 
 qint64 FakeErrorReply::readData(char *buf, qint64 max)
@@ -1117,13 +1113,23 @@ FakeReply::FakeReply(QObject *parent)
 
 FakeReply::~FakeReply() { }
 
+void FakeReply::checkedFinished()
+{
+    // It can happen that this job is cancelled before the full data is read, and the job is aborted. This being the test framework, processing happens
+    // synchronously, so between the signals above and here, the job can get aborted, which emits the finished signal. So do NOT emit it again if
+    // this is the case.
+    if (!isFinished()) {
+        setFinished(true);
+        Q_EMIT finished();
+    }
+}
+
 void FakeReply::abort()
 {
     if (!isFinished()) {
         setError(OperationCanceledError, QStringLiteral("Operation Canceled"));
-        setFinished(true);
         Q_EMIT metaDataChanged();
-        Q_EMIT finished();
+        checkedFinished();
     }
 }
 

test/testutils/syncenginetestutils.h

@@ -299,10 +299,13 @@ class FakeReply : public QNetworkReply
     using QNetworkReply::setAttribute;
     using QNetworkReply::setRawHeader;
 
+    void checkedFinished();
+
     virtual void abort() override;
 };
 
 class FakePropfindReply : public FakeReply
+
 {
     Q_OBJECT