From a8eb38eb4124da6af7815fd3720718464745f152 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Mon, 26 Sep 2016 14:39:23 +0200
Subject: Speculative stabilization of titleChanged

Only wait on title-changed signal before checking, this also makes it
safe to reduce the timeout for changing title, speeding up the test.

Change-Id: I4ecaf9400dfea624b39c73277425e09a52ea7b92
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
---
 tests/auto/quick/qmltests/BLACKLIST                 | 3 ---
 tests/auto/quick/qmltests/data/test3.html           | 2 +-
 tests/auto/quick/qmltests/data/tst_titleChanged.qml | 3 +--
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/auto/quick/qmltests/BLACKLIST b/tests/auto/quick/qmltests/BLACKLIST
index 9e3871164..85dc845e4 100644
--- a/tests/auto/quick/qmltests/BLACKLIST
+++ b/tests/auto/quick/qmltests/BLACKLIST
@@ -19,9 +19,6 @@ windows
 [WebEngineViewSettings::test_javascriptDisabled]
 windows
 
-[WebEngineViewTitleChangedSignal::test_titleFirstLoad]
-windows
-
 [WebEngineViewUnhandledKeyEventPropagation::test_keyboardModifierMapping]
 windows
 
diff --git a/tests/auto/quick/qmltests/data/test3.html b/tests/auto/quick/qmltests/data/test3.html
index 0c0e4eebf..f09d06d45 100644
--- a/tests/auto/quick/qmltests/data/test3.html
+++ b/tests/auto/quick/qmltests/data/test3.html
@@ -5,7 +5,7 @@
 <script type="text/javascript">
 function kickOffTitleChange()
 {
-    var t = setTimeout("changeTitle('New Title')",3000);
+    var t = setTimeout("changeTitle('New Title')",500);
 }
 function changeTitle(title)
 {
diff --git a/tests/auto/quick/qmltests/data/tst_titleChanged.qml b/tests/auto/quick/qmltests/data/tst_titleChanged.qml
index 23361c5f4..54975af24 100644
--- a/tests/auto/quick/qmltests/data/tst_titleChanged.qml
+++ b/tests/auto/quick/qmltests/data/tst_titleChanged.qml
@@ -51,10 +51,9 @@ TestWebEngineView {
 
             var testUrl = Qt.resolvedUrl("test3.html")
             webEngineView.url = testUrl
-            verify(webEngineView.waitForLoadSucceeded())
+            spyTitle.wait()
             compare(webEngineView.title, "Test page 3")
             spyTitle.clear()
-
             spyTitle.wait()
             compare(webEngineView.title, "New Title")
         }
-- 
cgit v1.2.3