From e689ab5ebd601272ffef058b8858c5cb0f844263 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Wed, 11 Jan 2023 22:50:39 +0200 Subject: [PATCH] autotests: Make testSlidingPopups quicker The test waits longer than needed to determine whether effects stopped playing animations Before Executed in 22.41 secs fish external usr time 997.42 millis 722.00 micros 996.70 millis sys time 744.81 millis 79.00 micros 744.73 millis After Executed in 9.71 secs fish external usr time 894.42 millis 1.03 millis 893.38 millis sys time 689.80 millis 0.11 millis 689.69 millis --- .../integration/effects/slidingpopups_test.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/autotests/integration/effects/slidingpopups_test.cpp b/autotests/integration/effects/slidingpopups_test.cpp index 543973a345..9bce0ac023 100644 --- a/autotests/integration/effects/slidingpopups_test.cpp +++ b/autotests/integration/effects/slidingpopups_test.cpp @@ -156,9 +156,6 @@ void SlidingPopupsTest::testWithOtherEffect() QVERIFY(!slidingPoupus->isActive()); QVERIFY(!otherEffect->isActive()); - // give the compositor some time to render - QTest::qWait(50); - QSignalSpy windowAddedSpy(effects, &EffectsHandler::windowAdded); // create an xcb window @@ -209,8 +206,7 @@ void SlidingPopupsTest::testWithOtherEffect() // wait till effect ends QTRY_VERIFY(!slidingPoupus->isActive()); - QTest::qWait(300); - QVERIFY(!otherEffect->isActive()); + QTRY_VERIFY(!otherEffect->isActive()); // and destroy the window again xcb_unmap_window(c.get(), windowId); @@ -228,8 +224,7 @@ void SlidingPopupsTest::testWithOtherEffect() QVERIFY(windowDeletedSpy.wait()); QCOMPARE(windowDeletedSpy.count(), 1); - QTRY_VERIFY(!slidingPoupus->isActive()); - QTest::qWait(300); + QVERIFY(!slidingPoupus->isActive()); QVERIFY(!otherEffect->isActive()); xcb_destroy_window(c.get(), windowId); c.reset(); @@ -322,8 +317,7 @@ void SlidingPopupsTest::testWithOtherEffectWayland() // wait till effect ends QTRY_VERIFY(!slidingPoupus->isActive()); - QTest::qWait(300); - QVERIFY(!otherEffect->isActive()); + QTRY_VERIFY(!otherEffect->isActive()); // and destroy the window again shellSurface.reset(); @@ -341,8 +335,7 @@ void SlidingPopupsTest::testWithOtherEffectWayland() QVERIFY(windowDeletedSpy.wait()); QCOMPARE(windowDeletedSpy.count(), 1); - QTRY_VERIFY(!slidingPoupus->isActive()); - QTest::qWait(300); + QVERIFY(!slidingPoupus->isActive()); QVERIFY(!otherEffect->isActive()); }