Debugger: Improve autotest output on failure

Change-Id: Ia463b198b5d6dac8e480d141412cb4475e54d204
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>

2 files changed, 15 insertions, 4 deletions

diff --git a/tests/auto/qml/debugger/shared/debugutil.cpp b/tests/auto/qml/debugger/shared/debugutil.cpp
index 925f5372cd..eea777f09d 100644
--- a/tests/auto/qml/debugger/shared/debugutil.cpp
+++ b/tests/auto/qml/debugger/shared/debugutil.cpp
@@ -65,7 +65,7 @@ QByteArray QQmlDebugTestClient::waitForResponse()
     lastMsg.clear();
     QQmlDebugTest::waitForSignal(this, SIGNAL(serverMessage(QByteArray)));
     if (lastMsg.isEmpty()) {
-        qWarning() << "tst_QQmlDebugTestClient: no response from server!";
+        qWarning() << "no response from server!";
         return QByteArray();
     }
     return lastMsg;
@@ -91,7 +91,7 @@ QQmlDebugProcess::QQmlDebugProcess(const QString &executable)
     m_timer.setSingleShot(true);
     m_timer.setInterval(5000);
     connect(&m_process, SIGNAL(readyReadStandardOutput()), this, SLOT(processAppOutput()));
-    connect(&m_timer, SIGNAL(timeout()), &m_eventLoop, SLOT(quit()));
+    connect(&m_timer, SIGNAL(timeout()), SLOT(timeout()));
 }
 
 QQmlDebugProcess::~QQmlDebugProcess()
@@ -117,6 +117,13 @@ void QQmlDebugProcess::stop()
     }
 }
 
+void QQmlDebugProcess::timeout()
+{
+    qWarning() << "Timeout while waiting for QML debugging messages "
+                  "in application output";
+    m_eventLoop.quit();
+}
+
 bool QQmlDebugProcess::waitForSessionStart()
 {
     if (m_process.state() != QProcess::Running) {
@@ -153,14 +160,17 @@ void QQmlDebugProcess::processAppOutput()
         const QString line = m_outputBuffer.left(nlIndex);
         m_outputBuffer = m_outputBuffer.right(m_outputBuffer.size() - nlIndex - 1);
 
-        if (line.startsWith("QML debugging is enabled")) // ignore
-            continue;
         if (line.startsWith("QML Debugger:")) {
             if (line.contains("Waiting for connection ")) {
                 m_started = true;
                 m_eventLoop.quit();
                 continue;
             }
+            if (line.contains("Unable to listen")) {
+                qWarning() << "App was unable to bind to port!";
+                m_eventLoop.quit();
+                continue;
+            }
         }
     }
     m_mutex.unlock();
diff --git a/tests/auto/qml/debugger/shared/debugutil_p.h b/tests/auto/qml/debugger/shared/debugutil_p.h
index 4350056caf..0b3b8ec2a6 100644
--- a/tests/auto/qml/debugger/shared/debugutil_p.h
+++ b/tests/auto/qml/debugger/shared/debugutil_p.h
@@ -96,6 +96,7 @@ public:
     void stop();
 
 private slots:
+    void timeout();
     void processAppOutput();
 
 private: