summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2021-07-15 11:30:11 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-16 18:01:02 +0000
commit8f582ad99699f9a699cbd84f6e1de044c4a523d5 (patch)
treeb070189854ab367fe20ec54322ae841a9ee3bdc8 /tests/auto
parent1c1e70b0fb09bc93be2be74c7919c024c9f55024 (diff)
Blacklist one page and one view test for arm
There is currently no way to get coin vm in reasonable time to investigate the issue. Adjust timings to see if this would be enough. Change-Id: I59bf80da7d283c87e2d0ae95d2330bc0626a351f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit ebb52fdf01a26b38d93010dfa20758fa7ec1da4c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/widgets/qwebenginepage/BLACKLIST3
-rw-r--r--tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp2
-rw-r--r--tests/auto/widgets/qwebengineview/BLACKLIST3
-rw-r--r--tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp2
4 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/widgets/qwebenginepage/BLACKLIST b/tests/auto/widgets/qwebenginepage/BLACKLIST
index 2498ed765..0c84b8de1 100644
--- a/tests/auto/widgets/qwebenginepage/BLACKLIST
+++ b/tests/auto/widgets/qwebenginepage/BLACKLIST
@@ -4,3 +4,6 @@ osx
[mouseMovementProperties]
windows
macos # Can't move cursor (QTBUG-76312)
+
+[acceptNavigationRequestNavigationType]
+b2qt arm
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 7e848dbe4..7ac2b043a 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -2966,7 +2966,7 @@ void tst_QWebEnginePage::loadInSignalHandlers()
URLSetter setter(m_page, signal, type, urlForSetter);
QSignalSpy spy(&setter, &URLSetter::finished);
m_page->load(url);
- QTRY_COMPARE(spy.count(), 1);
+ QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 20000);
QCOMPARE(m_page->url(), urlForSetter);
}
diff --git a/tests/auto/widgets/qwebengineview/BLACKLIST b/tests/auto/widgets/qwebengineview/BLACKLIST
index c1a46e16d..eccf02971 100644
--- a/tests/auto/widgets/qwebengineview/BLACKLIST
+++ b/tests/auto/widgets/qwebengineview/BLACKLIST
@@ -9,3 +9,6 @@ osx
[mixLangLocale:eu_ES]
*
+
+[reusePage]
+b2qt arm
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 6777cfaaa..2e3943e29 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -383,7 +383,7 @@ void tst_QWebEngineView::reusePage()
if (html.contains("</embed>")) {
// some reasonable time for the PluginStream to feed test.swf to flash and start painting
QSignalSpy spyFinished(view1, &QWebEngineView::loadFinished);
- QVERIFY(spyFinished.wait(2000));
+ QVERIFY(spyFinished.wait(20000));
}
view1->show();