summaryrefslogtreecommitdiffstats
path: root/tests/auto/network
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/network')
-rw-r--r--tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp29
-rw-r--r--tests/auto/network/socket/qudpsocket/BLACKLIST8
-rw-r--r--tests/auto/network/ssl/qsslcertificate/BLACKLIST2
3 files changed, 38 insertions, 1 deletions
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 7bf3ee4af4..c70fbce46c 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -98,6 +98,7 @@ private slots:
void removeServer();
void recycleServer();
+ void recycleClientSocket();
void multiConnect();
void writeOnlySocket();
@@ -955,6 +956,34 @@ void tst_QLocalSocket::recycleServer()
QVERIFY(server.nextPendingConnection() != 0);
}
+void tst_QLocalSocket::recycleClientSocket()
+{
+ const QByteArrayList lines = QByteArrayList() << "Have you heard of that new band"
+ << "\"1023 Megabytes\"?"
+ << "They haven't made it to a gig yet.";
+ QLocalServer server;
+ const QString serverName = QStringLiteral("recycleClientSocket");
+ QVERIFY(server.listen(serverName));
+ QLocalSocket client;
+ QSignalSpy clientReadyReadSpy(&client, SIGNAL(readyRead()));
+ QSignalSpy clientErrorSpy(&client, SIGNAL(error(QLocalSocket::LocalSocketError)));
+ for (int i = 0; i < lines.count(); ++i) {
+ client.abort();
+ clientReadyReadSpy.clear();
+ client.connectToServer(serverName);
+ QVERIFY(client.waitForConnected());
+ QVERIFY(server.waitForNewConnection());
+ QLocalSocket *serverSocket = server.nextPendingConnection();
+ QVERIFY(serverSocket);
+ connect(serverSocket, &QLocalSocket::disconnected, &QLocalSocket::deleteLater);
+ serverSocket->write(lines.at(i));
+ serverSocket->flush();
+ QVERIFY(clientReadyReadSpy.wait());
+ QCOMPARE(client.readAll(), lines.at(i));
+ QVERIFY(clientErrorSpy.isEmpty());
+ }
+}
+
void tst_QLocalSocket::multiConnect()
{
QLocalServer server;
diff --git a/tests/auto/network/socket/qudpsocket/BLACKLIST b/tests/auto/network/socket/qudpsocket/BLACKLIST
new file mode 100644
index 0000000000..3e936aebf6
--- /dev/null
+++ b/tests/auto/network/socket/qudpsocket/BLACKLIST
@@ -0,0 +1,8 @@
+[multicast:same bind, group ipv6 address]
+*
+[multicast:valid bind, group ipv6 address]
+osx
+[multicast:dual bind, group ipv6 address]
+osx
+[multicast:same bind, group ipv4 address]
+osx
diff --git a/tests/auto/network/ssl/qsslcertificate/BLACKLIST b/tests/auto/network/ssl/qsslcertificate/BLACKLIST
index 2e376fa2a9..25509a5ca8 100644
--- a/tests/auto/network/ssl/qsslcertificate/BLACKLIST
+++ b/tests/auto/network/ssl/qsslcertificate/BLACKLIST
@@ -1,3 +1,3 @@
# OpenSSL version is too new. Rich will fix :)
[subjectAndIssuerAttributes]
-osx
+*