From d55db285fc4ae0a978591213c294f53ab879cd40 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 11 Dec 2014 17:50:01 -0800 Subject: Autotest: Fix a race condition in launching the QtDBus sub-processes Wait for the subprocess to print "ready" before assuming that it is ready to receive calls. waitForStarted() will return as soon as the child is running, but it may not have registered on D-Bus yet. This also solves the synchronization problem more elegantly than how tst_qdbusmarshall.cpp was trying to do it. Change-Id: I548dfba2677cc5a34ba50f4310c4d5baa98093b2 Reviewed-by: Simon Hausmann --- tests/benchmarks/dbus/qdbusperformance/server/server.cpp | 1 + tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp | 1 + 2 files changed, 2 insertions(+) (limited to 'tests/benchmarks/dbus') diff --git a/tests/benchmarks/dbus/qdbusperformance/server/server.cpp b/tests/benchmarks/dbus/qdbusperformance/server/server.cpp index 12ae6ec6fb..6ee13b5c71 100644 --- a/tests/benchmarks/dbus/qdbusperformance/server/server.cpp +++ b/tests/benchmarks/dbus/qdbusperformance/server/server.cpp @@ -51,6 +51,7 @@ int main(int argc, char *argv[]) ServerObject obj(objectPath, con); printf("ready.\n"); + fflush(stdout); return app.exec(); } diff --git a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp index eff69fe24d..4bc3c94cd0 100644 --- a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp +++ b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp @@ -86,6 +86,7 @@ void tst_QDBusPerformance::initTestCase() #endif proc.start(QFINDTESTDATA("server/server" EXE)); QVERIFY2(proc.waitForStarted(), qPrintable(proc.errorString())); + QVERIFY(proc.waitForReadyRead()); QTestEventLoop::instance().enterLoop(5); QVERIFY(con.interface()->isServiceRegistered(serviceName)); -- cgit v1.2.3