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

Fix flaky testTextInputV3Interface

Browse source 
In a74c436156, we changed behavior that
every commit() will be followed by a done(), which makes this test might
catch a different done() from server. Change the spy to make sure it
exhaust all other done before checking the one expected.
This commit is contained in:
Weng Xuetian 2022-06-22 09:33:18 -07:00 committed by Xuetian Weng
parent 2ade8111de
commit 18763d1483
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/wayland/autotests/server/test_textinputv3_interface.cpp
View file

@ -557,6 +557,7 @@ void TestTextInputV3Interface::testMultipleTextinputs()
QVERIFY(m_serverTextInputV3);
QVERIFY(!m_serverTextInputV3->isEnabled());
QSignalSpy doneSpy1(ti1, &TextInputV3::done);
QSignalSpy committedSpy(m_serverTextInputV3, &TextInputV3Interface::stateCommitted);
// Enable ti1
ti1->enable();
@ -564,6 +565,7 @@ void TestTextInputV3Interface::testMultipleTextinputs()
QVERIFY(committedSpy.wait());
QCOMPARE(committedSpy.last().at(0).value<quint32>(), 1);
QVERIFY(m_serverTextInputV3->isEnabled());
QVERIFY(doneSpy1.wait());
// Send another three commits on ti1
ti1->enable();
@ -572,6 +574,7 @@ void TestTextInputV3Interface::testMultipleTextinputs()
QVERIFY(committedSpy.wait());
QCOMPARE(committedSpy.last().at(0).value<quint32>(), 2);
QVERIFY(m_serverTextInputV3->isEnabled());
QVERIFY(doneSpy1.wait());
ti1->enable();
ti1->set_content_type(QtWayland::zwp_text_input_v3::content_hint_none, QtWayland::zwp_text_input_v3::content_purpose_normal);
@ -579,9 +582,9 @@ void TestTextInputV3Interface::testMultipleTextinputs()
QVERIFY(committedSpy.wait());
QCOMPARE(committedSpy.last().at(0).value<quint32>(), 3);
QVERIFY(m_serverTextInputV3->isEnabled());
QVERIFY(doneSpy1.wait());
// at this point total commit count to ti1 is 3
QSignalSpy doneSpy1(ti1, &TextInputV3::done);
QSignalSpy doneSpy2(ti2, &TextInputV3::done);
m_serverTextInputV3->commitString("Hello");