on xenial help sign in
update PhoneStage tests to deal with the dash app always being there
5fa08c1Michael Zanetti
tests/qmltests/Stages/tst_PhoneStage.qml+3−2
@@ -231,9 +231,10 @@ Item {
231 }
231 }
232
232
233 function cleanup() {
233 function cleanup() {
234− while (ApplicationManager.count > 0) {
234+ while (ApplicationManager.count > 1) {
235 var oldCount = ApplicationManager.count;
235 var oldCount = ApplicationManager.count;
236+ var closingIndex = ApplicationManager.focusedApplicationId == "unity8-dash" ? 1 : 0
236− ApplicationManager.stopApplication(ApplicationManager.get(0).appId)
237+ ApplicationManager.stopApplication(ApplicationManager.get(closingIndex).appId)
237 tryCompare(ApplicationManager, "count", oldCount - 1)
238 tryCompare(ApplicationManager, "count", oldCount - 1)
238 }
239 }
239 }
240 }