From 7c45b035b97ce705d536932965673dca7cfa489e Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 16 Aug 2017 15:14:46 +0200 Subject: Make sure QQmlDebugProcess correctly reports session as started If the "Waiting" output appears before we wait, the event loop could run forever. Also, the timeout of 5s was too low. We increase it to 15s. Remove the blacklists and other workarounds in turn. Task-number: QTQAINFRA-1334 Change-Id: Ib1032a8e57ab8dada3e56163ebab1523a7357aeb Reviewed-by: Simon Hausmann --- tests/auto/qml/debugger/shared/debugutil.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tests/auto/qml/debugger/shared/debugutil.cpp') diff --git a/tests/auto/qml/debugger/shared/debugutil.cpp b/tests/auto/qml/debugger/shared/debugutil.cpp index 7b9e935678..d31efc84cf 100644 --- a/tests/auto/qml/debugger/shared/debugutil.cpp +++ b/tests/auto/qml/debugger/shared/debugutil.cpp @@ -126,7 +126,7 @@ QQmlDebugProcess::QQmlDebugProcess(const QString &executable, QObject *parent) { m_process.setProcessChannelMode(QProcess::MergedChannels); m_timer.setSingleShot(true); - m_timer.setInterval(5000); + m_timer.setInterval(15000); connect(&m_process, SIGNAL(readyReadStandardOutput()), this, SLOT(processAppOutput())); connect(&m_process, SIGNAL(errorOccurred(QProcess::ProcessError)), this, SLOT(processError(QProcess::ProcessError))); @@ -208,7 +208,10 @@ bool QQmlDebugProcess::waitForSessionStart() if (m_process.state() != QProcess::Running) { qWarning() << "Could not start up " << m_executable; return false; + } else if (m_started) { + return true; } + m_eventLoop.exec(); return m_started; -- cgit v1.2.3