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

[autotests/integration] Some more changes to try to make InternalWindowTest pass again

Browse source
This commit is contained in:
Martin Gräßlin 2016-08-16 14:32:27 +02:00
parent 6af0cc6ebe
commit 0b475c50d2
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
autotests/integration/internal_window.cpp
View file

@ -338,6 +338,7 @@ void InternalWindowTest::testKeyboard()
auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue); auto c = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
QVERIFY(c); QVERIFY(c);
QVERIFY(c->isActive()); QVERIFY(c->isActive());
QVERIFY(!c->isInternal());
if (enteredSpy.isEmpty()) { if (enteredSpy.isEmpty()) {
QVERIFY(enteredSpy.wait()); QVERIFY(enteredSpy.wait());
@ -347,10 +348,7 @@ void InternalWindowTest::testKeyboard()
QSignalSpy windowShownSpy(internalClient, &ShellClient::windowShown); QSignalSpy windowShownSpy(internalClient, &ShellClient::windowShown);
QVERIFY(windowShownSpy.isValid()); QVERIFY(windowShownSpy.isValid());
win.show(); win.show();
if (windowShownSpy.isEmpty()) { QTRY_COMPARE(windowShownSpy.count(), 1);
QVERIFY(windowShownSpy.wait());
}
QCOMPARE(windowShownSpy.count(), 1);
QVERIFY(leftSpy.isEmpty()); QVERIFY(leftSpy.isEmpty());
QVERIFY(!leftSpy.wait(100)); QVERIFY(!leftSpy.wait(100));