From a153bb232ce29fbb9c6b3c0afc2eaf6b54a23785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Mon, 21 Sep 2015 13:49:45 +0200 Subject: Stabilize qguieventloop test. The test assumed that an event loop can be tested for emptiness multiple times, which is wrong because an event can be delivered any time. Change-Id: Ic44245321eeed2091b640ada2c83d205b83a1cc2 Reviewed-by: Simon Hausmann --- tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'tests/auto/corelib/kernel/qeventloop') diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp index f555d2e58e..c8bb4cda6e 100644 --- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp +++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp @@ -207,22 +207,11 @@ void tst_QEventLoop::processEvents() QCOMPARE(awakeSpy.count(), 1); // allow any session manager to complete its handshake, so that - // there are no pending events left. + // there are no pending events left. This tests that we are able + // to process all events from the queue, otherwise it will hang. while (eventLoop.processEvents()) ; - // On mac we get application started events at this point, - // so process events one more time just to be sure. - eventLoop.processEvents(); - - // no events to process, QEventLoop::processEvents() should return - // false - aboutToBlockSpy.clear(); - awakeSpy.clear(); - QVERIFY(!eventLoop.processEvents()); - QCOMPARE(aboutToBlockSpy.count(), 0); - QCOMPARE(awakeSpy.count(), 1); - // make sure the test doesn't block forever int timerId = startTimer(100); -- cgit v1.2.3