on xenial help sign in
fix tests by resetting Greeter singleton objects inbetween Shell instances
2255cd7Michael Terry
tests/qmltests/tst_Shell.qml+1
@@ -194,6 +194,7 @@ Item {
194 killApps(ApplicationManager);
194 killApps(ApplicationManager);
195
195
196 unlockAllModemsSpy.clear()
196 unlockAllModemsSpy.clear()
197+ LightDM.Greeter.authenticate(""); // reset greeter
197
198
198 // reload our test subject to get it in a fresh state once again
199 // reload our test subject to get it in a fresh state once again
199 shellLoader.active = true;
200 shellLoader.active = true;
tests/qmltests/tst_ShellWithPin.qml+1
@@ -161,6 +161,7 @@ Item {
161 AccountsService.enableIndicatorsWhileLocked = true
161 AccountsService.enableIndicatorsWhileLocked = true
162 AccountsService.demoEdges = false
162 AccountsService.demoEdges = false
163 callManager.foregroundCall = null
163 callManager.foregroundCall = null
164+ LightDM.Greeter.authenticate(""); // reset greeter
164
165
165 // reload our test subject to get it in a fresh state once again
166 // reload our test subject to get it in a fresh state once again
166 shellLoader.active = true
167 shellLoader.active = true
tests/qmltests/tst_TabletShell.qml+1
@@ -149,6 +149,7 @@ Row {
149
149
150 unlockAllModemsSpy.clear()
150 unlockAllModemsSpy.clear()
151 AccountsService.demoEdges = false
151 AccountsService.demoEdges = false
152+ LightDM.Greeter.authenticate(""); // reset greeter
152
153
153 // reload our test subject to get it in a fresh state once again
154 // reload our test subject to get it in a fresh state once again
154 shellLoader.active = true
155 shellLoader.active = true