Merge lp:~gerboland/libqtdbustest/increase-wait-timeout into lp:libqtdbustest

[Gerry Boland]

Increase timeout when waiting for mock dbus service to appear on the bus.

May help test success on heavily loaded machines

[lp:~gerboland/libqtdbustest/increase-wait-timeout]

40. By Gerry Boland on 2016-02-08

Add support for QDBUS_DBUS_START_TIMEOUT env var to customize timeout

[Pete Woods (pete-woods)]

review: Approve

=== modified file 'src/libqtdbustest/QProcessDBusService.cpp'
--- src/libqtdbustest/QProcessDBusService.cpp	2013-11-13 10:13:18 +0000
+++ src/libqtdbustest/QProcessDBusService.cpp	2016-02-08 17:27:20 +0000
@@ -27,6 +27,21 @@
 
 namespace QtDBusTest {
 
+namespace {
+	int timeoutInSeconds() {
+		const int defaultTimeout = 15;
+		QByteArray timeoutString = qgetenv("QDBUS_DBUS_START_TIMEOUT");
+		if (!timeoutString.isEmpty()) {
+			bool ok;
+			const int timeout = timeoutString.toInt(&ok);
+			if (ok) {
+				return timeout;
+			}
+		}
+		return defaultTimeout;
+	}
+} // anonymous namespace
+
 class QProcessDBusServicePrivate {
 public:
 	QProcessDBusServicePrivate(const QString &program,
@@ -70,7 +85,7 @@
 			throw std::logic_error(error.toStdString());
 		}
 	} else {
-		spy.wait();
+		spy.wait(timeoutInSeconds() * 1000);
 		if (spy.empty()) {
 			QString error = "Process [" + p->m_program + "] for service ["
 					+ name() + "] failed to appear on bus";