summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/kernel/qtimer/BLACKLIST2
-rw-r--r--tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/kernel/qtimer/BLACKLIST b/tests/auto/corelib/kernel/qtimer/BLACKLIST
index 977b3a673a..e69de29bb2 100644
--- a/tests/auto/corelib/kernel/qtimer/BLACKLIST
+++ b/tests/auto/corelib/kernel/qtimer/BLACKLIST
@@ -1,2 +0,0 @@
-[zeroTimer]
-ubuntu-20.04
diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
index 1db210e0bd..00686ab46e 100644
--- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
+++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
@@ -94,11 +94,13 @@ void tst_QTimer::zeroTimer()
{
QTimer timer;
timer.setInterval(0);
+ timer.setSingleShot(true);
QSignalSpy timeoutSpy(&timer, &QTimer::timeout);
timer.start();
- QCoreApplication::processEvents();
+ // Pass timeout to work round glib issue, see QTBUG-84291.
+ QCoreApplication::processEvents(QEventLoop::AllEvents, INT_MAX);
QCOMPARE(timeoutSpy.count(), 1);
}