on xenial help sign in
stabilize++
46f7f9cLukáš Tinkl
tests/qmltests/Panel/tst_IndicatorsBar.qml+2
@@ -137,6 +137,8 @@ IndicatorTest {
137
137
138 function wait_for_expansion_to_settle() {
138 function wait_for_expansion_to_settle() {
139 waitUntilTransitionsEnd(indicatorsBar);
139 waitUntilTransitionsEnd(indicatorsBar);
140+ tryCompare(heightAnimation, "running", false);
141+ wait(UbuntuAnimation.SnapDuration); // put a little extra wait in for things to settle
140 }
142 }
141
143
142 // Rough check that expanding a selected item keeps it within the area of the original item.
144 // Rough check that expanding a selected item keeps it within the area of the original item.
tests/qmltests/tst_OrientedShell.qml+1
@@ -1117,6 +1117,7 @@ Rectangle {
1117
1117
1118 function test_attachRemoveInputDevices(data) {
1118 function test_attachRemoveInputDevices(data) {
1119 loadShell("mako")
1119 loadShell("mako")
1120+ MockInputDeviceBackend.removeDevice("/indicator_kbd0");
1120 var shell = findChild(orientedShell, "shell");
1121 var shell = findChild(orientedShell, "shell");
1121 var inputMethod = findChild(shell, "inputMethod");
1122 var inputMethod = findChild(shell, "inputMethod");
1122
1123