1 files changed, 7 insertions, 16 deletions
diff --git a/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp b/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
index 0cb29d121b..0b33f9b1cf 100644
--- a/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
+++ b/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
@@ -236,6 +236,7 @@ void tst_QDBusAbstractInterface::initTestCase()
 #else
 #  define EXE ""
 #endif
+    proc.setProcessChannelMode(QProcess::ForwardedErrorChannel);
     proc.start(QFINDTESTDATA("qpinger/qpinger" EXE));
     QVERIFY2(proc.waitForStarted(), qPrintable(proc.errorString()));
     QVERIFY(proc.waitForReadyRead());
@@ -252,19 +253,10 @@ void tst_QDBusAbstractInterface::initTestCase()
 
 void tst_QDBusAbstractInterface::cleanupTestCase()
 {
-    // Kill peer, resetting the object exported by a separate process
-#ifdef Q_OS_WIN
-    proc.kill(); // non-GUI processes don't respond to QProcess::terminate()
-#else
-    proc.terminate();
-#endif
-    QVERIFY(proc.waitForFinished() || proc.state() == QProcess::NotRunning);
-
-    // Wait until the service is certainly not registered
-    QDBusConnection con = QDBusConnection::sessionBus();
-    if (con.isConnected()) {
-        QTRY_VERIFY(!con.interface()->isServiceRegistered(serviceName));
-    }
+    QDBusMessage msg = QDBusMessage::createMethodCall(serviceName, objectPath, interfaceName, "quit");
+    QDBusConnection::sessionBus().call(msg);
+    proc.waitForFinished(200);
+    proc.close();
 }
 
 void tst_QDBusAbstractInterface::init()
@@ -276,10 +268,9 @@ void tst_QDBusAbstractInterface::init()
     QDBusConnection peercon = QDBusConnection::connectToPeer(peerAddress, "peer");
     QVERIFY(peercon.isConnected());
 
-    QDBusMessage req2 = QDBusMessage::createMethodCall(serviceName, objectPath, interfaceName, "isConnected");
+    QDBusMessage req2 = QDBusMessage::createMethodCall(serviceName, objectPath, interfaceName, "waitForConnected");
     QDBusMessage rpl2 = con.call(req2);
-    QVERIFY(rpl2.type() == QDBusMessage::ReplyMessage);
-    QVERIFY(rpl2.arguments().at(0).toBool());
+    QVERIFY2(rpl2.type() == QDBusMessage::ReplyMessage, rpl2.errorMessage().toLatin1());
 }
 
 void tst_QDBusAbstractInterface::cleanup()