diff options
author | Martin Negyokru <negyokru@inf.u-szeged.hu> | 2023-06-30 17:29:03 +0200 |
---|---|---|
committer | Martin Negyokru <negyokru@inf.u-szeged.hu> | 2023-07-28 04:20:19 +0000 |
commit | e354d602e5459dc27e209a0e62aefc4107cc8903 (patch) | |
tree | 678b84a7932417856d5f149fb99ce9bcc92a9461 | |
parent | 7549daf002b1d941204c975d35438b22a55b7651 (diff) |
Fix blacklisted qemu-arm64 tests
- test_findTextInterruptedByLoad:
Remove whitespaces from the text as it takes lot
of time to render according to perf.
It should fix the timeout errors.
- loadStartedAfterInPageNavigation:
Remove the viewport meta tag from test.html.
The 2x scale is only applied in embedded builds,
it puts some elements out of the view.
- acceptNavigationRequestNavigationType:
Refresh the reload.html page only once.
On qemu it may reload multiple times messing up
the list of navigation types.
- horizontalScrollbarTest:
Skip instead of blacklist.
- tst_qtbug_110287:
Use an url that loads faster.
Pick-to: 6.6
Task-number: QTBUG-105342
Change-Id: Ifbd41885fee62b12f7022534f9b8bd5e20cbef01
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | tests/auto/quick/qmltests/BLACKLIST | 5 | ||||
-rw-r--r-- | tests/auto/quick/qmltests/data/test4.html | 1 | ||||
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_findText.qml | 3 | ||||
-rw-r--r-- | tests/auto/widgets/qtbug_110287/BLACKLIST | 2 | ||||
-rw-r--r-- | tests/auto/widgets/qtbug_110287/tst_qtbug_110287.cpp | 2 | ||||
-rw-r--r-- | tests/auto/widgets/qwebenginepage/BLACKLIST | 3 | ||||
-rw-r--r-- | tests/auto/widgets/qwebenginepage/resources/reload.html | 2 | ||||
-rw-r--r-- | tests/auto/widgets/qwebengineview/BLACKLIST | 1 | ||||
-rw-r--r-- | tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 6 |
9 files changed, 9 insertions, 16 deletions
diff --git a/tests/auto/quick/qmltests/BLACKLIST b/tests/auto/quick/qmltests/BLACKLIST index 36c737693..fc8f9f0d8 100644 --- a/tests/auto/quick/qmltests/BLACKLIST +++ b/tests/auto/quick/qmltests/BLACKLIST @@ -10,8 +10,3 @@ macos [CertificateError::test_error] * -[WebViewFindText::test_findTextInterruptedByLoad] -b2qt arm 64bit - -[WebEngineViewLoadUrl::test_loadStartedAfterInPageNavigation] -b2qt diff --git a/tests/auto/quick/qmltests/data/test4.html b/tests/auto/quick/qmltests/data/test4.html index cf5708994..82830668a 100644 --- a/tests/auto/quick/qmltests/data/test4.html +++ b/tests/auto/quick/qmltests/data/test4.html @@ -9,7 +9,6 @@ font-size: 50px; } </style> - <meta name="viewport" content="initial-scale=2.0"/> </head> <body> <button onclick="scrollWin()" id="scroll">Click me to scroll!</button><br><br> diff --git a/tests/auto/quick/qmltests/data/tst_findText.qml b/tests/auto/quick/qmltests/data/tst_findText.qml index 392ce5dca..597cff73e 100644 --- a/tests/auto/quick/qmltests/data/tst_findText.qml +++ b/tests/auto/quick/qmltests/data/tst_findText.qml @@ -206,8 +206,7 @@ TestWebEngineView { var listItemText = ''; for (var i = 0; i < 100000; ++i) - listItemText += "bla "; - listItemText = listItemText.trim(); + listItemText += "bla"; webEngineView.loadHtml( "<html><body>" + diff --git a/tests/auto/widgets/qtbug_110287/BLACKLIST b/tests/auto/widgets/qtbug_110287/BLACKLIST deleted file mode 100644 index 1b99e1503..000000000 --- a/tests/auto/widgets/qtbug_110287/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[getAddrInfo] -b2qt arm diff --git a/tests/auto/widgets/qtbug_110287/tst_qtbug_110287.cpp b/tests/auto/widgets/qtbug_110287/tst_qtbug_110287.cpp index 1389682da..9453ae9b8 100644 --- a/tests/auto/widgets/qtbug_110287/tst_qtbug_110287.cpp +++ b/tests/auto/widgets/qtbug_110287/tst_qtbug_110287.cpp @@ -22,7 +22,7 @@ void tst_qtbug_110287::getAddrInfo() QNetworkAccessManager nam; QSignalSpy namSpy(&nam, &QNetworkAccessManager::finished); - QString address("http://www.qt.io"); + QString address("http://www.example.com"); QScopedPointer<QNetworkReply> reply(nam.get(QNetworkRequest(address))); if (!namSpy.wait(25000) || reply->error() != QNetworkReply::NoError) diff --git a/tests/auto/widgets/qwebenginepage/BLACKLIST b/tests/auto/widgets/qwebenginepage/BLACKLIST index 66c5de42c..52def48d1 100644 --- a/tests/auto/widgets/qwebenginepage/BLACKLIST +++ b/tests/auto/widgets/qwebenginepage/BLACKLIST @@ -5,9 +5,6 @@ osx windows macos # Can't move cursor (QTBUG-76312) -[acceptNavigationRequestNavigationType] -b2qt arm - [comboBoxPopupPositionAfterMove] macos diff --git a/tests/auto/widgets/qwebenginepage/resources/reload.html b/tests/auto/widgets/qwebenginepage/resources/reload.html index d9c33dfcd..6fc570cae 100644 --- a/tests/auto/widgets/qwebenginepage/resources/reload.html +++ b/tests/auto/widgets/qwebenginepage/resources/reload.html @@ -1,6 +1,6 @@ <html> <head> -<meta http-equiv="refresh" content="2"> +<meta http-equiv="refresh" content="2;url="> </head> <body> This is test content diff --git a/tests/auto/widgets/qwebengineview/BLACKLIST b/tests/auto/widgets/qwebengineview/BLACKLIST index 356f9c9b0..26f2da4bb 100644 --- a/tests/auto/widgets/qwebengineview/BLACKLIST +++ b/tests/auto/widgets/qwebengineview/BLACKLIST @@ -8,6 +8,5 @@ windows windows [horizontalScrollbarTest] -b2qt # different scrollbar macos rhel # flaky diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index c242d240e..a0f93faac 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -684,6 +684,12 @@ void tst_QWebEngineView::unhandledKeyEventPropagation() void tst_QWebEngineView::horizontalScrollbarTest() { +#if QT_CONFIG(webengine_embedded_build) + // Embedded builds enable the OverlayScrollbar and Viewport features (see 'useEmbeddedSwitches' in web_engine_context.cpp). + // These features make the scrollbar simpler assuming we are on a device with small (usually touch) display. + // These scrollbars behave differently on mouse events. + QSKIP("Embedded builds have different scrollbar, skipping test."); +#endif QString html("<html><body>" "<div style='width: 1000px; height: 1000px; background-color: green' />" "</body></html>"); |