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

[autotests/integration] Try hardening destroyWaylandConnection

Browse source 
Destroying the connection is threaded. Only wait if the signal was
not already caught.
This commit is contained in:
Martin Gräßlin 2016-08-08 10:10:26 +02:00
parent a902ba8ea3
commit 23bfa05f46
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
autotests/integration/test_helpers.cpp
View file

@ -172,7 +172,9 @@ void destroyWaylandConnection()
if (s_waylandConnection.thread) {
QSignalSpy spy(s_waylandConnection.connection, &QObject::destroyed);
s_waylandConnection.connection->deleteLater();
QVERIFY(spy.wait());
if (spy.isEmpty()) {
QVERIFY(spy.wait());
}
s_waylandConnection.thread->quit();
s_waylandConnection.thread->wait();
delete s_waylandConnection.thread;