diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-09-14 18:11:59 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-09-15 08:27:48 +0000 |
| commit | c47d865cb2b900ec9b8b5650cd75c7743b6678ba (patch) | |
| tree | cd12b60a4eb31e166cd2e7dde47e0eb3149570b8 /tests/auto/qml/debugger | |
| parent | c04b5edd549594be9ef13448d4abdcd77d7f38e9 (diff) | |
Re-enable QDebugMessageService test
The lines were wrong and the signal handling was flawed. Otherwise the
test works fine.
Change-Id: I818fd3ec92b3413c938ee125a3bb2662cd71faa1
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'tests/auto/qml/debugger')
| -rw-r--r-- | tests/auto/qml/debugger/debugger.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp | 11 |
2 files changed, 4 insertions, 8 deletions
diff --git a/tests/auto/qml/debugger/debugger.pro b/tests/auto/qml/debugger/debugger.pro index 5a08418be1..355d80a762 100644 --- a/tests/auto/qml/debugger/debugger.pro +++ b/tests/auto/qml/debugger/debugger.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs PUBLICTESTS += \ + qdebugmessageservice \ qqmlenginedebugservice \ qqmldebugjs \ qqmlinspector \ diff --git a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp index d0801dd4ee..0f8b7ef9f2 100644 --- a/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp +++ b/tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp @@ -212,21 +212,16 @@ void tst_QDebugMessageService::retrieveDebugOutput() { init(); - int maxTries = 2; - while ((m_client->logBuffer.size() < 2) - || (maxTries-- > 0)) - QQmlDebugTest::waitForSignal(m_client, SIGNAL(debugOutput()), 1000); - - QVERIFY(m_client->logBuffer.size() >= 2); + QTRY_VERIFY(m_client->logBuffer.size() >= 2); const QString path = QUrl::fromLocalFile(QQmlDataTest::instance()->testFile(QMLFILE)).toString(); LogEntry entry1(QtDebugMsg, QLatin1String("console.log")); - entry1.line = 48; + entry1.line = 40; entry1.file = path; entry1.function = QLatin1String("onCompleted"); LogEntry entry2(QtDebugMsg, QLatin1String("console.count: 1")); - entry2.line = 49; + entry2.line = 41; entry2.file = path; entry2.function = QLatin1String("onCompleted"); |