summaryrefslogtreecommitdiffstats
path: root/tests/auto/network
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/network')
-rw-r--r--tests/auto/network/access/http2/tst_http2.cpp9
-rw-r--r--tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp84
-rw-r--r--tests/auto/network/ssl/qsslsocket/BLACKLIST2
-rw-r--r--tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp18
4 files changed, 110 insertions, 3 deletions
diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp
index e7609b3243..d7a57f5e26 100644
--- a/tests/auto/network/access/http2/tst_http2.cpp
+++ b/tests/auto/network/access/http2/tst_http2.cpp
@@ -590,8 +590,15 @@ void tst_Http2::replyFinished()
{
QVERIFY(nRequests);
- if (const auto reply = qobject_cast<QNetworkReply *>(sender()))
+ if (const auto reply = qobject_cast<QNetworkReply *>(sender())) {
QCOMPARE(reply->error(), QNetworkReply::NoError);
+ const QVariant http2Used(reply->attribute(QNetworkRequest::HTTP2WasUsedAttribute));
+ QVERIFY(http2Used.isValid());
+ QVERIFY(http2Used.toBool());
+ const QVariant spdyUsed(reply->attribute(QNetworkRequest::SpdyWasUsedAttribute));
+ QVERIFY(spdyUsed.isValid());
+ QVERIFY(!spdyUsed.toBool());
+ }
--nRequests;
if (!nRequests && serverGotSettingsACK)
diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
index 1133a80820..9a604e5d04 100644
--- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
+++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
@@ -52,6 +52,13 @@
#include <QtNetwork/qnetworksession.h>
#endif
+#if defined(Q_OS_LINUX)
+#define SHOULD_CHECK_SYSCALL_SUPPORT
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <errno.h>
+#endif
+
Q_DECLARE_METATYPE(QHostAddress)
QT_FORWARD_DECLARE_CLASS(QUdpSocket)
@@ -115,6 +122,12 @@ protected slots:
void async_readDatagramSlot();
private:
+ bool shouldSkipIpv6TestsForBrokenSetsockopt();
+#ifdef SHOULD_CHECK_SYSCALL_SUPPORT
+ bool ipv6SetsockoptionMissing(int level, int optname);
+#endif
+
+ bool m_skipUnsupportedIPv6Tests;
QList<QHostAddress> allAddresses;
#ifndef QT_NO_BEARERMANAGEMENT
QNetworkConfigurationManager *netConfMan;
@@ -125,6 +138,43 @@ private:
QUdpSocket *m_asyncReceiver;
};
+#ifdef SHOULD_CHECK_SYSCALL_SUPPORT
+bool tst_QUdpSocket::ipv6SetsockoptionMissing(int level, int optname)
+{
+ int testSocket;
+
+ testSocket = socket(PF_INET6, SOCK_DGRAM, 0);
+
+ // If we can't test here, assume it's not missing
+ if (testSocket == -1)
+ return false;
+
+ bool result = false;
+ if (setsockopt(testSocket, level, optname, nullptr, 0) == -1)
+ if (errno == ENOPROTOOPT)
+ result = true;
+
+ close(testSocket);
+ return result;
+}
+#endif //SHOULD_CHECK_SYSCALL_SUPPORT
+
+bool tst_QUdpSocket::shouldSkipIpv6TestsForBrokenSetsockopt()
+{
+#ifdef SHOULD_CHECK_SYSCALL_SUPPORT
+ // Following parameters for setsockopt are not supported by all QEMU versions:
+ if (ipv6SetsockoptionMissing(SOL_IPV6, IPV6_JOIN_GROUP)
+ || ipv6SetsockoptionMissing(SOL_IPV6, IPV6_MULTICAST_HOPS)
+ || ipv6SetsockoptionMissing(SOL_IPV6, IPV6_MULTICAST_IF)
+ || ipv6SetsockoptionMissing(SOL_IPV6, IPV6_MULTICAST_LOOP)
+ || ipv6SetsockoptionMissing(SOL_IPV6, IPV6_RECVHOPLIMIT)) {
+ return true;
+ }
+#endif //SHOULD_CHECK_SYSCALL_SUPPORT
+
+ return false;
+}
+
static QHostAddress makeNonAny(const QHostAddress &address, QHostAddress::SpecialAddress preferForAny = QHostAddress::LocalHost)
{
if (address == QHostAddress::Any)
@@ -176,6 +226,7 @@ void tst_QUdpSocket::initTestCase()
if (!QtNetworkSettings::verifyTestNetworkSettings())
QSKIP("No network test server available");
allAddresses = QNetworkInterface::allAddresses();
+ m_skipUnsupportedIPv6Tests = shouldSkipIpv6TestsForBrokenSetsockopt();
}
void tst_QUdpSocket::init()
@@ -1140,6 +1191,13 @@ void tst_QUdpSocket::multicastTtlOption()
expected = 0;
}
+ // Some syscalls needed for ipv6 udp multicasting are not functional
+ if (m_skipUnsupportedIPv6Tests) {
+ if (bindAddress.protocol() == QAbstractSocket::IPv6Protocol) {
+ QSKIP("Syscalls needed for ipv6 udp multicasting missing functionality");
+ }
+ }
+
QUdpSocket udpSocket;
#ifdef FORCE_SESSION
udpSocket.setProperty("_q_networksession", QVariant::fromValue(networkSession));
@@ -1186,6 +1244,13 @@ void tst_QUdpSocket::multicastLoopbackOption()
expected = 0;
}
+ // Some syscalls needed for ipv6 udp multicasting are not functional
+ if (m_skipUnsupportedIPv6Tests) {
+ if (bindAddress.protocol() == QAbstractSocket::IPv6Protocol) {
+ QSKIP("Syscalls needed for ipv6 udp multicasting missing functionality");
+ }
+ }
+
QUdpSocket udpSocket;
#ifdef FORCE_SESSION
udpSocket.setProperty("_q_networksession", QVariant::fromValue(networkSession));
@@ -1240,6 +1305,13 @@ void tst_QUdpSocket::multicastLeaveAfterClose()
if (!QtNetworkSettings::hasIPv6() && groupAddress.protocol() == QAbstractSocket::IPv6Protocol)
QSKIP("system doesn't support ipv6!");
+ // Some syscalls needed for ipv6 udp multicasting are not functional
+ if (m_skipUnsupportedIPv6Tests) {
+ if (groupAddress.protocol() == QAbstractSocket::IPv6Protocol) {
+ QSKIP("Syscalls needed for ipv6 udp multicasting missing functionality");
+ }
+ }
+
QUdpSocket udpSocket;
#ifdef FORCE_SESSION
udpSocket.setProperty("_q_networksession", QVariant::fromValue(networkSession));
@@ -1280,6 +1352,11 @@ void tst_QUdpSocket::setMulticastInterface()
QFETCH(QNetworkInterface, iface);
QFETCH(QHostAddress, address);
+ // Some syscalls needed for udp multicasting are not functional
+ if (m_skipUnsupportedIPv6Tests) {
+ QSKIP("Syscalls needed for udp multicasting missing functionality");
+ }
+
QUdpSocket udpSocket;
// bind initializes the socket
bool bound = udpSocket.bind((address.protocol() == QAbstractSocket::IPv6Protocol
@@ -1339,6 +1416,13 @@ void tst_QUdpSocket::multicast()
return;
}
+ // Some syscalls needed for ipv6 udp multicasting are not functional
+ if (m_skipUnsupportedIPv6Tests) {
+ if (groupAddress.protocol() == QAbstractSocket::IPv6Protocol) {
+ QSKIP("Syscalls needed for ipv6 udp multicasting missing functionality");
+ }
+ }
+
QUdpSocket receiver;
#ifdef FORCE_SESSION
receiver.setProperty("_q_networksession", QVariant::fromValue(networkSession));
diff --git a/tests/auto/network/ssl/qsslsocket/BLACKLIST b/tests/auto/network/ssl/qsslsocket/BLACKLIST
index 52c023b78f..cfab0b7eb0 100644
--- a/tests/auto/network/ssl/qsslsocket/BLACKLIST
+++ b/tests/auto/network/ssl/qsslsocket/BLACKLIST
@@ -5,3 +5,5 @@ windows
rhel-7.2
[protocolServerSide:tls1.0-any]
rhel-7.2
+[protocolServerSide]
+osx-10.11
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index f44e5261dd..4e2974b4bf 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -29,6 +29,7 @@
#include <QtCore/qglobal.h>
#include <QtCore/qthread.h>
+#include <QtCore/qoperatingsystemversion.h>
#include <QtNetwork/qhostaddress.h>
#include <QtNetwork/qhostinfo.h>
#include <QtNetwork/qnetworkproxy.h>
@@ -1170,6 +1171,19 @@ void tst_QSslSocket::protocolServerSide_data()
QTest::addColumn<QSsl::SslProtocol>("clientProtocol");
QTest::addColumn<bool>("works");
+ // On macOS 10.11 with SecureTransport backend some tests are failing for no
+ // obvious reason (so no bug in our code): QTBUG-48860 - an error can be
+ // errSSLInternal or cipher negotiation failure. This problem does not exist
+ // on macOS before 10.11 and after 10.11, so we adjust these tests only for 10.11.
+
+#if defined(QT_SECURETRANSPORT)
+ using OSVersion = QOperatingSystemVersion;
+ const bool testWorks = OSVersion::current() < OSVersion::OSXElCapitan
+ || OSVersion::current() > OSVersion::OSXElCapitan;
+#else
+ const bool testWorks = true;
+#endif
+
#if !defined(OPENSSL_NO_SSL2) && !defined(QT_SECURETRANSPORT)
QTest::newRow("ssl2-ssl2") << QSsl::SslV2 << QSsl::SslV2 << false; // no idea why it does not work, but we don't care about SSL 2
#endif
@@ -1194,14 +1208,14 @@ void tst_QSslSocket::protocolServerSide_data()
#endif
#if !defined(OPENSSL_NO_SSL3)
QTest::newRow("ssl3-tls1.0") << QSsl::SslV3 << QSsl::TlsV1_0 << false;
- QTest::newRow("ssl3-tls1ssl3") << QSsl::SslV3 << QSsl::TlsV1SslV3 << true;
+ QTest::newRow("ssl3-tls1ssl3") << QSsl::SslV3 << QSsl::TlsV1SslV3 << testWorks;
QTest::newRow("ssl3-secure") << QSsl::SslV3 << QSsl::SecureProtocols << false;
#endif
#if !defined(OPENSSL_NO_SSL2) && !defined(QT_SECURETRANSPORT) && !defined(OPENSSL_NO_SSL3)
QTest::newRow("ssl3-any") << QSsl::SslV3 << QSsl::AnyProtocol << false; // we won't set a SNI header here because we connect to a
// numerical IP, so OpenSSL will send a SSL 2 handshake
#elif !defined(OPENSSL_NO_SSL3)
- QTest::newRow("ssl3-any") << QSsl::SslV3 << QSsl::AnyProtocol << true;
+ QTest::newRow("ssl3-any") << QSsl::SslV3 << QSsl::AnyProtocol << testWorks;
#endif
#if !defined(OPENSSL_NO_SSL2) && !defined(QT_SECURETRANSPORT)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 18:57:37 +0000