From 3b4079451b5841405d0d8f1b14c5fad7e2302581 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Mon, 4 Sep 2017 10:25:32 +0200
Subject: [PATCH] Skip tests due to issues with current 58-based Chromium
These will be restored once 60-based Chromium is used.
Task-number: QTBUG-62973
Change-Id: Ia1ad8e1dd7914e41f92d7a790f7c0b3956c68f28
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
tests/auto/quick/qquickwebengineview/BLACKLIST | 6 ++++++
.../quick/qquickwebengineview/tst_qquickwebengineview.cpp | 5 +++++
.../qwebengineaccessibility/tst_qwebengineaccessibility.cpp | 5 +++++
tests/auto/widgets/widgets.pro | 3 ++-
4 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/tests/auto/quick/qquickwebengineview/BLACKLIST b/tests/auto/quick/qquickwebengineview/BLACKLIST
index 2cde59454..831039266 100644
--- a/tests/auto/quick/qquickwebengineview/BLACKLIST
+++ b/tests/auto/quick/qquickwebengineview/BLACKLIST
@@ -3,3 +3,9 @@ windows
[inputEventForwardingDisabledWhenActiveFocusOnPressDisabled]
*
+
+[transparentWebEngineViews]
+*
+
+[basicRenderingSanity]
+*
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index 8af5a2808..8c3e2256b 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -261,6 +261,7 @@ void tst_QQuickWebEngineView::loadProgress()
void tst_QQuickWebEngineView::show()
{
+ QSKIP("Skip to due 58-based issues. Restore once 60-based is in.");
// This should not crash.
m_window->show();
QTest::qWait(200);
@@ -269,6 +270,7 @@ void tst_QQuickWebEngineView::show()
void tst_QQuickWebEngineView::showWebEngineView()
{
+ QSKIP("Skip to due 58-based issues. Restore once 60-based is in.");
webEngineView()->setUrl(urlFromTestPath("html/direct-image-compositing.html"));
QVERIFY(waitForLoadSucceeded(webEngineView()));
m_window->show();
@@ -281,6 +283,7 @@ void tst_QQuickWebEngineView::showWebEngineView()
void tst_QQuickWebEngineView::removeFromCanvas()
{
+ QSKIP("Skip to due 58-based issues. Restore once 60-based is in.");
showWebEngineView();
// This should not crash.
@@ -295,6 +298,7 @@ void tst_QQuickWebEngineView::removeFromCanvas()
void tst_QQuickWebEngineView::multipleWebEngineViewWindows()
{
+ QSKIP("Skip to due 58-based issues. Restore once 60-based is in.");
showWebEngineView();
// This should not crash.
@@ -317,6 +321,7 @@ void tst_QQuickWebEngineView::multipleWebEngineViewWindows()
void tst_QQuickWebEngineView::multipleWebEngineViews()
{
+ QSKIP("Skip to due 58-based issues. Restore once 60-based is in.");
showWebEngineView();
// This should not crash.
diff --git a/tests/auto/widgets/qwebengineaccessibility/tst_qwebengineaccessibility.cpp b/tests/auto/widgets/qwebengineaccessibility/tst_qwebengineaccessibility.cpp
index 56890bbae..6eb29db8d 100644
--- a/tests/auto/widgets/qwebengineaccessibility/tst_qwebengineaccessibility.cpp
+++ b/tests/auto/widgets/qwebengineaccessibility/tst_qwebengineaccessibility.cpp
@@ -68,6 +68,7 @@ void tst_QWebEngineAccessibility::cleanup()
void tst_QWebEngineAccessibility::noPage()
{
+ QSKIP("Skip to due 58-based issues. Restore once 60-based is in.");
QWebEngineView webView;
webView.show();
@@ -84,6 +85,7 @@ void tst_QWebEngineAccessibility::noPage()
void tst_QWebEngineAccessibility::hierarchy()
{
+ QSKIP("Skip to due 58-based issues. Restore once 60-based is in.");
QWebEngineView webView;
webView.setHtml("<html><body>" \
"Hello world" \
@@ -144,6 +146,7 @@ void tst_QWebEngineAccessibility::hierarchy()
void tst_QWebEngineAccessibility::text()
{
+ QSKIP("Skip to due 58-based issues. Restore once 60-based is in.");
QWebEngineView webView;
webView.setHtml("<html><body>" \
"<input type='text' value='Good morning!'></input>" \
@@ -213,6 +216,7 @@ void tst_QWebEngineAccessibility::text()
void tst_QWebEngineAccessibility::value()
{
+ QSKIP("Skip to due 58-based issues. Restore once 60-based is in.");
QWebEngineView webView;
webView.setHtml("<html><body>" \
"<div role='slider' aria-valuenow='4' aria-valuemin='1' aria-valuemax='10'></div>" \
@@ -386,6 +390,7 @@ void tst_QWebEngineAccessibility::roles_data()
void tst_QWebEngineAccessibility::roles()
{
+ QSKIP("Skip to due 58-based issues. Restore once 60-based is in.");
QFETCH(QString, html);
QFETCH(bool, isSection);
QFETCH(QAccessible::Role, role);
diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro
index 90352310e..d260b7c4f 100644
--- a/tests/auto/widgets/widgets.pro
+++ b/tests/auto/widgets/widgets.pro
@@ -6,7 +6,8 @@ SUBDIRS += \
qwebenginefaviconmanager \
qwebenginepage \
qwebenginehistory \
- qwebenginehistoryinterface \
+ # Skipped to due issue in 58-based. Restore once 60-based is in.
+ #qwebenginehistoryinterface \
qwebengineinspector \
qwebengineprofile \
qwebenginescript \
--
GitLab