From c580644fe91148f0cb5fde44d262678ef47c5faa Mon Sep 17 00:00:00 2001
From: Kari Oikarinen <kari.oikarinen@qt.io>
Date: Thu, 29 Mar 2018 11:50:58 +0300
Subject: tests/auto/network: Avoid unconditional qWait()s
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace with QSignalSpy or QTRY_COMPARE when possible.

Task-number: QTBUG-63992
Change-Id: I18dc8837301424855487a12ee62451a5aeb21bf0
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
---
 tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp')

diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 53d260f19e..779d55a77a 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -1225,12 +1225,13 @@ public:
         socket.write("testing\n");
         exec();
     }
+signals:
+    void bytesWrittenReceived();
 public slots:
-   void bytesWritten(qint64) {
+    void bytesWritten(qint64) {
+        emit bytesWrittenReceived();
         exit();
-   }
-
-private:
+    }
 };
 
 /*
@@ -1248,11 +1249,12 @@ void tst_QLocalSocket::bytesWrittenSignal()
     QLocalServer server;
     QVERIFY(server.listen("qlocalsocket_readyread"));
     WriteThread writeThread;
+    QSignalSpy receivedSpy(&writeThread, &WriteThread::bytesWrittenReceived);
     writeThread.start();
     bool timedOut = false;
     QVERIFY(server.waitForNewConnection(3000, &timedOut));
     QVERIFY(!timedOut);
-    QTest::qWait(2000);
+    QVERIFY(receivedSpy.wait(2000));
     QVERIFY(writeThread.wait(2000));
 }
 
-- 
cgit v1.2.3