From 773d8c61b1f39b8e5c463fd7e87585bc2e7eed90 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Wed, 11 Jan 2023 22:29:15 +0200 Subject: [PATCH] autotests: Reduce execution time of testLockScreen testLockScreen uses !eventSpy.wait() expression to check whether the given signal is emitted. QSignalSpy::wait()'s default timeout is 5s, which is too much. We don't need to wait that much, in fact, even wl_display_sync() would suffice. In either case, let's pass explicit timeout of 10ms which should be good enough. Before Executed in 60.49 secs fish external usr time 3.92 secs 1.03 millis 3.92 secs sys time 2.29 secs 0.16 millis 2.29 secs After Executed in 19.38 secs fish external usr time 1.64 secs 347.00 micros 1.64 secs sys time 1.15 secs 54.00 micros 1.15 secs --- autotests/integration/lockscreen.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/autotests/integration/lockscreen.cpp b/autotests/integration/lockscreen.cpp index 793ebab0ee..38ee875f60 100644 --- a/autotests/integration/lockscreen.cpp +++ b/autotests/integration/lockscreen.cpp @@ -252,7 +252,7 @@ void LockScreenTest::testPointer() MOTION(window->frameGeometry().center()); MOTION(window->frameGeometry().bottomRight() + QPoint(100, 100)); MOTION(window->frameGeometry().bottomRight() + QPoint(100, 100)); - QVERIFY(!leftSpy.wait()); + QVERIFY(!leftSpy.wait(10)); QCOMPARE(leftSpy.count(), 1); QCOMPARE(enteredSpy.count(), 1); @@ -295,9 +295,9 @@ void LockScreenTest::testPointerButton() // and simulate a click PRESS; - QVERIFY(!buttonChangedSpy.wait()); + QVERIFY(!buttonChangedSpy.wait(10)); RELEASE; - QVERIFY(!buttonChangedSpy.wait()); + QVERIFY(!buttonChangedSpy.wait(10)); UNLOCK; QVERIFY(enteredSpy.wait()); @@ -332,9 +332,9 @@ void LockScreenTest::testPointerAxis() // and simulate axis Test::pointerAxisHorizontal(5.0, timestamp++); - QVERIFY(!axisChangedSpy.wait(100)); + QVERIFY(!axisChangedSpy.wait(10)); Test::pointerAxisVertical(5.0, timestamp++); - QVERIFY(!axisChangedSpy.wait(100)); + QVERIFY(!axisChangedSpy.wait(10)); // and unlock UNLOCK; @@ -527,9 +527,9 @@ void LockScreenTest::testEffectsKeyboardAutorepeat() // while locked key repeat should not pass any events to the Effect LOCK; KEYPRESS(KEY_B); - QVERIFY(!inputSpy.wait(200)); + QVERIFY(!inputSpy.wait(10)); KEYRELEASE(KEY_B); - QVERIFY(!inputSpy.wait(200)); + QVERIFY(!inputSpy.wait(10)); UNLOCK; // don't test again, that's covered by testEffectsKeyboard @@ -680,15 +680,15 @@ void LockScreenTest::testKeyboardShortcut() QVERIFY(actionSpy.wait()); QCOMPARE(actionSpy.count(), 1); KEYRELEASE(KEY_SPACE); - QVERIFY(!actionSpy.wait()); + QVERIFY(!actionSpy.wait(10)); QCOMPARE(actionSpy.count(), 1); LOCK; KEYPRESS(KEY_SPACE); - QVERIFY(!actionSpy.wait()); + QVERIFY(!actionSpy.wait(10)); QCOMPARE(actionSpy.count(), 1); KEYRELEASE(KEY_SPACE); - QVERIFY(!actionSpy.wait()); + QVERIFY(!actionSpy.wait(10)); QCOMPARE(actionSpy.count(), 1); UNLOCK; @@ -696,7 +696,7 @@ void LockScreenTest::testKeyboardShortcut() QVERIFY(actionSpy.wait()); QCOMPARE(actionSpy.count(), 2); KEYRELEASE(KEY_SPACE); - QVERIFY(!actionSpy.wait()); + QVERIFY(!actionSpy.wait(10)); QCOMPARE(actionSpy.count(), 2); KEYRELEASE(KEY_LEFTCTRL); KEYRELEASE(KEY_LEFTMETA); @@ -723,7 +723,7 @@ void LockScreenTest::testTouch() QVERIFY(cancelSpy.wait()); Test::touchUp(1, timestamp++); - QVERIFY(!pointRemovedSpy.wait(100)); + QVERIFY(!pointRemovedSpy.wait(10)); Test::touchDown(1, QPointF(25, 25), timestamp++); Test::touchMotion(1, QPointF(26, 26), timestamp++); Test::touchUp(1, timestamp++);