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

[autotests/wayland_client] Make TestWaylandShell more robust

Browse source
This commit is contained in:
Martin Gräßlin 2014-09-03 21:31:10 +02:00
parent 08def82e13
commit 00802824d7
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/wayland/test_wayland_shell.cpp
View file

@ -109,6 +109,14 @@ void TestWaylandShell::init()
m_connection->initConnection(); m_connection->initConnection();
QVERIFY(connectedSpy.wait()); QVERIFY(connectedSpy.wait());
// TODO: we should destroy the queue
wl_event_queue *queue = wl_display_create_queue(m_connection->display());
connect(m_connection, &KWin::Wayland::ConnectionThread::eventsRead, this,
[this, queue]() {
wl_display_dispatch_queue_pending(m_connection->display(), queue);
wl_display_flush(m_connection->display());
},
Qt::QueuedConnection);
KWin::Wayland::Registry registry; KWin::Wayland::Registry registry;
QSignalSpy compositorSpy(&registry, SIGNAL(compositorAnnounced(quint32,quint32))); QSignalSpy compositorSpy(&registry, SIGNAL(compositorAnnounced(quint32,quint32)));
@ -116,6 +124,7 @@ void TestWaylandShell::init()
registry.create(m_connection->display()); registry.create(m_connection->display());
QVERIFY(registry.isValid()); QVERIFY(registry.isValid());
registry.setup(); registry.setup();
wl_proxy_set_queue((wl_proxy*)registry.registry(), queue);
QVERIFY(compositorSpy.wait()); QVERIFY(compositorSpy.wait());
m_compositor = new KWin::Wayland::Compositor(this); m_compositor = new KWin::Wayland::Compositor(this);
@ -233,6 +242,7 @@ void TestWaylandShell::testPing()
pongSpy.clear(); pongSpy.clear();
pingTimeoutSpy.clear(); pingTimeoutSpy.clear();
serverSurface->ping(); serverSurface->ping();
QTest::qWait(100);
if (pingTimeoutSpy.isEmpty()) { if (pingTimeoutSpy.isEmpty()) {
QVERIFY(pingTimeoutSpy.wait()); QVERIFY(pingTimeoutSpy.wait());
} }