summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-10-30 15:09:55 +0100
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-11-02 12:38:50 +0000
commitdfaffcbf2a20cd7ff781de88ac3e73d9f17d1cdf (patch)
tree38af908f2c2cec971b5d27d48d7130b4b9e1963c /tests
parent5a7f69f82434498124f060386d518a099d3aca16 (diff)
QWindowsPipeReader: fix occasional "Unknown error 995"
After canceling the asynchronous read operation, the notified() slot receives ERROR_OPERATION_ABORTED. We must not handle this situation as an error. This amends commit 5ce567c5. Task-number: QTBUG-48336 Change-Id: Iff948ceb3ad1f805a9de8c188fbc39ed4c76ba82 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp29
1 files changed, 29 insertions, 0 deletions
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 4881d86937..9130aff4e2 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();
@@ -954,6 +955,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;