diff options
| author | kh1 <karsten.heimrich@digia.com> | 2014-06-03 15:35:37 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-06-03 15:48:08 +0200 |
| commit | e07968ebb99b7fe4e67c0470ec486a92816036d5 (patch) | |
| tree | ad7e3bf5d95cae2ca57de0b745060f7276c72259 /tests | |
| parent | 22fb61b60c0686795f9671789ab3393da6c22987 (diff) | |
We need to pass the socket to the connect function.
The keep alive thread does try to delete the socket it gets
from the connect method, but since the socket was created in
a different thread and we will hit the:
"Socket notifiers cannot be disabled from another thread" warning.
Change-Id: Ibafcd67f8cdb51b365c3ef230f1ebd447bdd306a
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/installer/clientserver/tst_clientserver.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/installer/clientserver/tst_clientserver.cpp b/tests/auto/installer/clientserver/tst_clientserver.cpp index e068050dc..abf1b7b79 100644 --- a/tests/auto/installer/clientserver/tst_clientserver.cpp +++ b/tests/auto/installer/clientserver/tst_clientserver.cpp @@ -77,8 +77,9 @@ private slots: server.start(); RemoteClient::instance().init(39999, QHostAddress::LocalHost, RemoteClient::Debug); - QScopedPointer<QTcpSocket> socket(QInstaller::RemoteClient::instance().connect()); - QVERIFY2(!socket.isNull(), "Socket is NULL, could not connect to server."); + QTcpSocket socket; + QVERIFY2(RemoteClient::instance().connect(&socket), "Socket is NULL, could " + "not connect to server."); } void testQSettingsWrapper() |