diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-18 12:53:05 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-18 16:56:32 +0200 |
commit | 35520c49198b02531d3eee7bd44ac09a24004ab7 (patch) | |
tree | e40662f40239bf6ed8cdab4d9b267980f6a6caf0 | |
parent | 2bda081449239c32443d332b182b2631618a36bc (diff) |
Massage toolTipCrashOnClose test
QTest::ignoreMessage() has a feature, namely that:
If the test finished and the message was not outputted,
a test failure is appended to the test log.
So here, if Graphical Effects is available, but not functional,
ShaderEffect fails to initialize, which means the warning-to-be-skipped
is never outputted. The test would pass (because the visual appearance
does not matter), but the ignoreMessage() condition fails it.
Adding a QSKIP is not a solution because ignoreMessage() would still
do its check and fail the test! Therefore, remove the ignoreMessage()
altogether.
Change-Id: I3e096752dfc6894c77859e786c8a4cac01d6fc53
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r-- | tests/auto/qquickpopup/tst_qquickpopup.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp index fbe44991..9241e884 100644 --- a/tests/auto/qquickpopup/tst_qquickpopup.cpp +++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp @@ -1273,11 +1273,6 @@ void tst_QQuickPopup::toolTipCrashOnClose() QQuickWindow *window = helper.window; window->show(); - // The warning only occurs with debug builds for some reason. - // In any case, the warning is irrelevant, but using ShaderEffectSource is important, so we ignore it. -#ifdef QT_DEBUG - QTest::ignoreMessage(QtWarningMsg, "ShaderEffectSource: 'recursive' must be set to true when rendering recursively."); -#endif QVERIFY(QTest::qWaitForWindowActive(window)); QTest::mouseMove(window, QPoint(window->width() / 2, window->height() / 2)); |