git.iko.soy/unity8
on xenial help sign in
Fix autopilot tests
commit24738c02030dee625f3b3cc87fff042dfa095432 authorMichael Terry <michael.terry@canonical.com> dateMon 2 Feb 2015, 18:16 (12 years ago) parentbc1218a
3 files changed+2−10
compare with xenial
unifiedsplit
tests/autopilot/unity8/shell/emulators/main_window.py−6 tests/autopilot/unity8/shell/tests/__init__.py+2−3 tests/qmltests/tst_TabletShell.qml−1
tests/autopilot/unity8/shell/emulators/main_window.py−6
@@ -35,12 +35,6 @@ class QQuickView(emulators.UnityEmulatorBase):
3535 def get_greeter(self):
3636 return self.select_single(Greeter)
3737
38− def get_greeter_content_loader(self):
39− return self.wait_select_single(
40− "QQuickLoader",
41− objectName="greeterContentLoader"
42− )
43−
4438 def get_login_loader(self):
4539 return self.select_single("QQuickLoader", objectName="loginLoader")
4640
tests/autopilot/unity8/shell/tests/__init__.py+2−3
@@ -378,9 +378,8 @@ class UnityTestCase(AutopilotTestCase):
378378 self._proxy = None
379379
380380 def wait_for_unity(self):
381− greeter_content_loader = self.main_window.wait_select_single(
382− objectName='greeterContentLoader')
383− greeter_content_loader.progress.wait_for(1)
381+ greeter = self.main_window.wait_select_single(objectName='greeter')
382+ greeter.waiting.wait_for(False)
384383
385384 def get_dash(self):
386385 pid = process_helpers.get_job_pid('unity8-dash')
tests/qmltests/tst_TabletShell.qml−1
@@ -191,7 +191,6 @@ Item {
191191
192192 function selectUser(name) {
193193 // Find index of user with the right name
194− var greeter = findChild(shell, "greeterContentLoader")
195194 for (var i = 0; i < LightDM.Users.count; i++) {
196195 if (LightDM.Users.data(i, LightDM.UserRoles.NameRole) == name) {
197196 break