diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-10-06 15:44:43 +0200 |
---|---|---|
committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-10-15 06:28:45 +0000 |
commit | 804ceab7882f1a5968271ae6b3ac31ffaff07b61 (patch) | |
tree | 042052cefc63a3db46efcd3256b84fbd6913a48f /tests/auto/quick/qmltests | |
parent | b0474a665195abd94b5b5319a2eca04baff2b73b (diff) |
Speculative fix of tst_unhandledKeyEventPropagation.qml quick auto test
This fix implements an attempt to remove wait from the test.
Task-number: QTBUG-56180
Change-Id: I2bfeb14ebc9451a1237178aa3c97bd1b27e9485c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests/auto/quick/qmltests')
-rw-r--r-- | tests/auto/quick/qmltests/BLACKLIST | 3 | ||||
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/tests/auto/quick/qmltests/BLACKLIST b/tests/auto/quick/qmltests/BLACKLIST index 63d31c875..390e91988 100644 --- a/tests/auto/quick/qmltests/BLACKLIST +++ b/tests/auto/quick/qmltests/BLACKLIST @@ -16,9 +16,6 @@ windows [WebEngineViewSettings::test_javascriptDisabled] windows -[WebEngineViewUnhandledKeyEventPropagation::test_keyboardModifierMapping] -windows - [WebEngineViewSource::test_viewSourceURL] windows diff --git a/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml b/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml index 87ef16aa2..906dc1658 100644 --- a/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml +++ b/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml @@ -68,12 +68,10 @@ Item { keyPress(Qt.Key_Left) keyRelease(Qt.Key_Left) - for (var i = 0; i < 20 && parentItem.releaseEvents.length < 3; i++) - wait(100) - - compare(parentItem.pressEvents.length, 1) + tryCompare(parentItem.pressEvents, "length", 1) compare(parentItem.pressEvents[0], Qt.Key_Left) - compare(parentItem.releaseEvents.length, 3) + + tryCompare(parentItem.releaseEvents, "length", 3) compare(parentItem.releaseEvents[0], Qt.Key_A) compare(parentItem.releaseEvents[1], Qt.Key_Left) compare(parentItem.releaseEvents[2], Qt.Key_Left) |