diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2023-02-17 11:10:18 +0000 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2023-03-20 17:39:18 +0100 |
| commit | 6a66554d3bdb81d3b1d738d262ece3fa0934352b (patch) | |
| tree | bed9faa6655df812903e52aca21882f432bb1a3b /tests/auto/network/socket/qtcpsocket | |
| parent | 2834d4263a5c19587076c4edd3621a0daaa81a56 (diff) | |
Revert "Skip socket and server tests on Ubuntu 22.04 and QEMU"
This reverts commit 9286d46ee25f84d24a509e703e294f792cba1483.
Reason for revert: Should be fixed by 5c6814fb18760f65bab0f8b9cd623ee5c874a58d
Change-Id: I3a161df445af8dcbb61138d57e931a093a319027
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'tests/auto/network/socket/qtcpsocket')
| -rw-r--r-- | tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt index 03485dc459..c3258f8a95 100644 --- a/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt @@ -12,7 +12,6 @@ qt_internal_add_test(tst_qtcpsocket LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - Qt::TestPrivate QT_TEST_SERVER_LIST "danted" "squid" "apache2" "ftp-proxy" "vsftpd" "iptables" "cyrus" ) diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index ca81332205..50c9192ea2 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -40,7 +40,6 @@ #ifndef QT_NO_SSL #include <QSslSocket> #endif -#include <QSysInfo> #include <QTextStream> #include <QThread> #include <QElapsedTimer> @@ -62,7 +61,6 @@ #include "private/qhostinfo_p.h" #include "../../../network-settings.h" -#include <QtTest/private/qemulationdetector_p.h> QT_FORWARD_DECLARE_CLASS(QTcpSocket) class SocketPair; @@ -327,11 +325,6 @@ void tst_QTcpSocket::initTestCase_data() void tst_QTcpSocket::initTestCase() { - QSysInfo sysInfo; - if (QTestPrivate::isRunningArmOnX86() - || (sysInfo.productType() == QStringLiteral("ubuntu") - && sysInfo.productVersion() == QStringLiteral("22.04"))) - QSKIP("Skipping test on Ubuntu 22.04 and QEMU, see QTBUG-107696."); #ifdef QT_TEST_SERVER QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::httpServerName(), 80)); QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::httpProxyServerName(), 3128)); |