1 files changed, 28 insertions, 9 deletions
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index e397e80fe0..0a58a5cf3b 100644
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -2093,31 +2093,50 @@ void tst_QTcpSocket::nestedEventLoopInErrorSlot()
 void tst_QTcpSocket::connectToHostError_data()
 {
     QTest::addColumn<QString>("host");
-    QTest::addColumn<int>("port");
+    QTest::addColumn<quint16>("port");
     QTest::addColumn<QAbstractSocket::SocketError>("expectedError");
 
-    QTest::newRow("localhost no service") << QStringLiteral("localhost") << 31415 << QAbstractSocket::ConnectionRefusedError;
-    QTest::newRow("unreachable") << QStringLiteral("0.0.0.1") << 65000 << QAbstractSocket::NetworkError;
+    QTest::newRow("localhost no service") << QStringLiteral("localhost") << quint16(31415) << QAbstractSocket::ConnectionRefusedError;
+    QTest::newRow("unreachable") << QStringLiteral("0.0.0.1") << quint16(65000) << QAbstractSocket::NetworkError;
 }
 
 
 void tst_QTcpSocket::connectToHostError()
 {
+    // We are aware of at least one OS in our CI, that would fail
+    // the test due to timeout - it's Ubuntu 20.04 and 'connect'
+    // to 0.0.0.1 there return EINPROGRESS, with no other error
+    // ever received, so only our own internal 30 s. timer can
+    // detect a connection timeout.
+
     std::unique_ptr<QTcpSocket> socket(newSocket());
 
     QAbstractSocket::SocketError error = QAbstractSocket::UnknownSocketError;
 
-    QFETCH(QString, host);
-    QFETCH(int, port);
+    QFETCH(const QString, host);
+    QFETCH(const quint16, port);
     QFETCH(QAbstractSocket::SocketError, expectedError);
 
-    connect(socket.get(), &QAbstractSocket::errorOccurred, [&](QAbstractSocket::SocketError socketError){
+    QTestEventLoop eventLoop;
+    connect(socket.get(), &QAbstractSocket::errorOccurred, socket.get(),
+            [&](QAbstractSocket::SocketError socketError) {
         error = socketError;
+        QTimer::singleShot(0, &eventLoop, [&]{eventLoop.exitLoop();});
     });
-    socket->connectToHost(host, port); // no service running here, one suspects
-    QTRY_COMPARE_WITH_TIMEOUT(socket->state(), QTcpSocket::UnconnectedState, 7000);
+
+    socket->connectToHost(host, port);
+    eventLoop.enterLoopMSecs(7000);
+    if (eventLoop.timeout() && port == 65000) {
+        // Let's at least verify it's not in connected state:
+        QVERIFY(socket->state() != QAbstractSocket::ConnectedState);
+        QSKIP("Connection to unreachable host timed out, skipping the rest of the test");
+    }
+
+    QCOMPARE(socket->state(), QTcpSocket::UnconnectedState);
+
     if (error != expectedError && error == QAbstractSocket::ConnectionRefusedError)
         QEXPECT_FAIL("unreachable", "CI firewall interfers with this test", Continue);
+
     QCOMPARE(error, expectedError);
 }
 
@@ -2201,7 +2220,7 @@ public slots:
 #if defined(Q_OS_MAC)
         pthread_yield_np();
 #elif defined Q_OS_LINUX && !defined Q_OS_ANDROID
-        pthread_yield();
+        sched_yield();
 #endif
         if (!sock->waitForConnected()) {
             networkTimeout = true;