yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[autotests] Fix debug console test

Browse source 
Summary:
Use QTRY_COMPARE macro to not fail if signal already sent. Also shorten
timeout on expect to fail test for faster test runs.

Test Plan: Debug console test passes again.

Reviewers: #kwin, zzag

Reviewed By: #kwin, zzag

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D22124
This commit is contained in:
Roman Gilg 2019-06-27 18:52:06 +02:00
parent 349560a78c
commit bc309929a0
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
autotests/integration/debug_console_test.cpp
View file

@ -392,7 +392,7 @@ void DebugConsoleTest::testWaylandClient()
Test::flushWaylandConnection(); Test::flushWaylandConnection();
qDebug() << rowsRemovedSpy.count(); qDebug() << rowsRemovedSpy.count();
QEXPECT_FAIL("wlShell", "Deleting a ShellSurface does not result in the server removing the ShellClient", Continue); QEXPECT_FAIL("wlShell", "Deleting a ShellSurface does not result in the server removing the ShellClient", Continue);
QVERIFY(rowsRemovedSpy.wait()); QVERIFY(rowsRemovedSpy.wait(500));
surface.reset(); surface.reset();
if (rowsRemovedSpy.isEmpty()) { if (rowsRemovedSpy.isEmpty()) {
@ -449,8 +449,7 @@ void DebugConsoleTest::testInternalWindow()
w->setGeometry(0, 0, 100, 100); w->setGeometry(0, 0, 100, 100);
w->show(); w->show();
QVERIFY(rowsInsertedSpy.wait()); QTRY_COMPARE(rowsInsertedSpy.count(), 1);
QCOMPARE(rowsInsertedSpy.count(), 1);
QCOMPARE(rowsInsertedSpy.first().first().value<QModelIndex>(), internalTopLevelIndex); QCOMPARE(rowsInsertedSpy.first().first().value<QModelIndex>(), internalTopLevelIndex);
QModelIndex clientIndex = model.index(rowsInsertedSpy.first().last().toInt(), 0, internalTopLevelIndex); QModelIndex clientIndex = model.index(rowsInsertedSpy.first().last().toInt(), 0, internalTopLevelIndex);