From 36f21c5b560c3036e3e74db8669e8eb0fb14b445 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 14 Jun 2017 11:00:29 +0200 Subject: Blacklist tst_QWidget::restoreVersion1Geometry for XCB FAIL! : tst_QWidget::restoreVersion1Geometry(geometry.dat) Compared values are not the same Actual (((widget.pos()))): QPoint(90,90) Expected (expectedPosition): QPoint(100,100) Loc: [tst_qwidget.cpp(3193)] Remove the previously added QSKIP since this test now passes. Task-number: QTBUG-26421 Task-number: QTBUG-46116 Change-Id: Ieff474a8a69c14a0df231a9a587aee02df4e8ea7 Reviewed-by: Joerg Bornemann --- tests/auto/widgets/kernel/qwidget/BLACKLIST | 2 +- tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/auto/widgets/kernel/qwidget/BLACKLIST b/tests/auto/widgets/kernel/qwidget/BLACKLIST index 46791ff884..01c8e783ad 100644 --- a/tests/auto/widgets/kernel/qwidget/BLACKLIST +++ b/tests/auto/widgets/kernel/qwidget/BLACKLIST @@ -7,7 +7,7 @@ ubuntu-14.04 ubuntu-16.04 b2qt [restoreVersion1Geometry] -ubuntu-14.04 +xcb osx [updateWhileMinimized] ubuntu-14.04 diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 0933dc991d..2b6dc5f7e1 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -3195,9 +3195,6 @@ void tst_QWidget::restoreVersion1Geometry() widget.showNormal(); QTest::qWait(10); - if (m_platform == QStringLiteral("xcb")) - QSKIP("QTBUG-26421"); - if (expectedWindowState != Qt::WindowNoState) { // restoring from maximized or fullscreen, we can only restore to the normal geometry QTRY_COMPARE(widget.geometry(), expectedNormalGeometry); -- cgit v1.2.3