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

[autotests/client] QSkip the WaylandFullscreenShellTest if _wl_fullscreenshell missing

Browse source 
Newer Weston renamed the interface to the unstable naming scheme. As
KWayland does not support this interface yet, the tests are failing.

This change skips the test if the Weston is too new and doesn't provide
the expected interface any more.
This commit is contained in:
Martin Gräßlin 2016-08-08 07:45:02 +02:00
parent a612cfa499
commit a092de25b4
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/wayland/autotests/client/test_wayland_fullscreen_shell.cpp
View file

@ -105,12 +105,19 @@ void TestWaylandFullscreenShell::testRegistry()
QVERIFY(connectedSpy.wait());
KWayland::Client::Registry registry;
QSignalSpy interfacesAnnouncedSpy(&registry, &KWayland::Client::Registry::interfaceAnnounced);
QVERIFY(interfacesAnnouncedSpy.isValid());
QSignalSpy announced(&registry, SIGNAL(fullscreenShellAnnounced(quint32,quint32)));
registry.create(connection.display());
QVERIFY(registry.isValid());
registry.setup();
wl_display_flush(connection.display());
QVERIFY(announced.wait());
QVERIFY(interfacesAnnouncedSpy.wait());
if (!registry.hasInterface(KWayland::Client::Registry::Interface::FullscreenShell)) {
QSKIP("Weston does not have fullscreen shell support");
}
QCOMPARE(announced.count(), 1);
KWayland::Client::FullscreenShell fullscreenShell;
QVERIFY(!fullscreenShell.isValid());
@ -132,12 +139,19 @@ void TestWaylandFullscreenShell::testRegistryCreate()
QVERIFY(connectedSpy.wait());
KWayland::Client::Registry registry;
QSignalSpy interfacesAnnouncedSpy(&registry, &KWayland::Client::Registry::interfaceAnnounced);
QVERIFY(interfacesAnnouncedSpy.isValid());
QSignalSpy announced(&registry, SIGNAL(fullscreenShellAnnounced(quint32,quint32)));
registry.create(connection.display());
QVERIFY(registry.isValid());
registry.setup();
wl_display_flush(connection.display());
QVERIFY(announced.wait());
QVERIFY(interfacesAnnouncedSpy.wait());
if (!registry.hasInterface(KWayland::Client::Registry::Interface::FullscreenShell)) {
QSKIP("Weston does not have fullscreen shell support");
}
QCOMPARE(announced.count(), 1);
KWayland::Client::FullscreenShell *fullscreenShell = registry.createFullscreenShell(announced.first().first().value<quint32>(), 1, &registry);
QVERIFY(fullscreenShell->isValid());