From 54c13c0e9524fb97802318bacc602c5fcf504a20 Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Tue, 23 Jul 2013 16:04:41 -0300 Subject: Fix tst_qquicktextinput::remoteCursorDelegate Do not query for QQmlComponent::Loading on remoteCursorDelegate: when a new connection is established to the test http server, it will setup a single shot QTimer with a 500ms timeout that will trigger the reply to be sent back, making the call to sendDelayedItem() obsolete and reduntant. Also, it means that in some platforms, data will arrive back to the component before the check for QQmlComponent::Loading is executed, causing the test to fail since at this point the status will already be QQmlComponent::Ready instead. Change-Id: I30adeed2a669d5f6618f56d8a023fe7eaea16bc0 Reviewed-by: Wolfgang Bremer Reviewed-by: Frederik Gladhorn --- tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp') diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp index def1c76ba1..06b757d198 100644 --- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp @@ -2775,7 +2775,6 @@ void tst_qquicktextinput::cursorDelegate() void tst_qquicktextinput::remoteCursorDelegate() { - QSKIP("This test is unstable"); TestHTTPServer server(SERVER_PORT); server.serveDirectory(dataDirectory(), TestHTTPServer::Delay); @@ -2799,10 +2798,6 @@ void tst_qquicktextinput::remoteCursorDelegate() textInputObject->setFocus(true); QVERIFY(textInputObject->isCursorVisible()); - QCOMPARE(component.status(), QQmlComponent::Loading); - QVERIFY(!textInputObject->findChild("cursorInstance")); - server.sendDelayedItem(); - // Wait for component to load. QTRY_COMPARE(component.status(), QQmlComponent::Ready); QVERIFY(textInputObject->findChild("cursorInstance")); -- cgit v1.2.3