AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Skip socket and server tests on Ubuntu 22.04 and QEMU"

Browse Source 
This reverts commit 9286d46ee2.

Reason for revert: Should be fixed by 5c6814fb18760f65bab0f8b9cd623ee5c874a58d

Change-Id: I3a161df445af8dcbb61138d57e931a093a319027
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Mårten Nordheim 2023-02-17 11:10:18 +00:00
parent 2834d4263a
commit 6a66554d3b
5 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/network/socket/qtcpserver/test/CMakeLists.txt
View File

@ -11,7 +11,6 @@ qt_internal_add_test(tst_qtcpserver
../tst_qtcpserver.cpp
LIBRARIES
Qt::Network
Qt::TestPrivate
QT_TEST_SERVER_LIST "danted" "cyrus" "squid" "ftp-proxy"
)

8
tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
View File

@ -2,7 +2,6 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include <qglobal.h>
// To prevent windows system header files from re-defining min/max
#define NOMINMAX 1
#if defined(_WIN32)
@ -37,11 +36,9 @@
#include <QNetworkProxy>
#include <QSet>
#include <QSysInfo>
#include <QList>
#include "../../../network-settings.h"
#include <QtTest/private/qemulationdetector_p.h>
#if defined(Q_OS_LINUX)
#define SHOULD_CHECK_SYSCALL_SUPPORT
@ -140,11 +137,6 @@ void tst_QTcpServer::initTestCase_data()
void tst_QTcpServer::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::socksProxyServerName(), 1080));
QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::httpProxyServerName(), 3128));

1
tests/auto/network/socket/qtcpsocket/test/CMakeLists.txt
View File

@ -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"
)

7
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
View File

@ -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));

6
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
View File

@ -27,7 +27,6 @@
#include <QTestEventLoop>
#include <QSignalSpy>
#include <QSemaphore>
#include <QSysInfo>
#include "private/qhostinfo_p.h"
#include "private/qiodevice_p.h" // for QIODEVICE_BUFFERSIZE
@ -397,11 +396,6 @@ void tst_QSslSocket::initTestCase_data()
void tst_QSslSocket::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.");
testDataDir = QFileInfo(QFINDTESTDATA("certs")).absolutePath();
if (testDataDir.isEmpty())
testDataDir = QCoreApplication::applicationDirPath();