Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: Idcef361153ac1f2af9f56619dbfb1227c0d407d7

1 files changed, 6 insertions, 1 deletions

diff --git a/tests/auto/proxy_multiprocess/client/main.cpp b/tests/auto/proxy_multiprocess/client/main.cpp
index 4874fb1..f37821f 100644
--- a/tests/auto/proxy_multiprocess/client/main.cpp
+++ b/tests/auto/proxy_multiprocess/client/main.cpp
@@ -72,6 +72,8 @@ private Q_SLOTS:
         qDebug() << "Verified expected initial states, sending start.";
         auto reply = m_rep->start();
         QVERIFY(reply.waitForFinished());
+        QVERIFY(reply.error() == QRemoteObjectPendingCall::NoError);
+        QCOMPARE(reply.returnValue(), QVariant::fromValue(true));
 
         QSignalSpy advanceSpy(m_rep.data(), SIGNAL(advance()));
         QVERIFY(advanceSpy.wait());
@@ -87,7 +89,10 @@ private Q_SLOTS:
     void cleanupTestCase()
     {
         auto reply = m_rep->quit();
-        QVERIFY(reply.waitForFinished());
+        // Don't verify the wait result, depending on the timing of the server and proxy
+        // closing it may return false.  We just need this process to stay alive long
+        // enough for the packets to be sent.
+        reply.waitForFinished(5000);
     }
 
 private: