diff options
Diffstat (limited to 'tests/auto/installer/clientserver/tst_clientserver.cpp')
| -rw-r--r-- | tests/auto/installer/clientserver/tst_clientserver.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/auto/installer/clientserver/tst_clientserver.cpp b/tests/auto/installer/clientserver/tst_clientserver.cpp index b5fa4ae93..662098c41 100644 --- a/tests/auto/installer/clientserver/tst_clientserver.cpp +++ b/tests/auto/installer/clientserver/tst_clientserver.cpp @@ -212,7 +212,7 @@ private slots: QLocalSocket socket; socket.connectToServer(socketName); - QVERIFY2(socket.waitForConnected(), "Could not connect to server."); + QVERIFY2(socket.waitForConnected(), "Cannot connect to server."); QCOMPARE(socket.state() == QLocalSocket::ConnectedState, true); sendCommand(&socket, Protocol::Authorize, QString(Protocol::DefaultAuthorizationKey)); @@ -245,7 +245,7 @@ private slots: QLocalSocket socket; socket.connectToServer(socketName); - QVERIFY2(socket.waitForConnected(), "Could not connect to server."); + QVERIFY2(socket.waitForConnected(), "Cannot connect to server."); QCOMPARE(socket.state() == QLocalSocket::ConnectedState, true); sendCommand(&socket, Protocol::Authorize, QString::fromLatin1("SomeKey")); @@ -459,8 +459,7 @@ private slots: } QSignalSpy spy(&wrapper, SIGNAL(started())); - QSignalSpy spy2(&wrapper, SIGNAL(finished(int))); - QSignalSpy spy3(&wrapper, SIGNAL(finished(int, QProcess::ExitStatus))); + QSignalSpy spy2(&wrapper, SIGNAL(finished(int, QProcess::ExitStatus))); #ifdef Q_OS_WIN wrapper.start(fileName); @@ -479,10 +478,6 @@ private slots: QCOMPARE(spy2.count(), 1); QList<QVariant> arguments = spy2.takeFirst(); QCOMPARE(arguments.first().toInt(), 0); - - QCOMPARE(spy3.count(), 1); - arguments = spy3.takeFirst(); - QCOMPARE(arguments.first().toInt(), 0); QCOMPARE(arguments.last().toInt(), int(QProcessWrapper::NormalExit)); QFile::remove(fileName); |