24738c0 · unity8 · git.iko.soy

tests/autopilot/unity8/shell/emulators/main_window.py−6

@@ -35,12 +35,6 @@ class QQuickView(emulators.UnityEmulatorBase):

35 def get_greeter(self):

36 return self.select_single(Greeter)

37

38− def get_greeter_content_loader(self):

39− return self.wait_select_single(

40− "QQuickLoader",

41− objectName="greeterContentLoader"

42− )

43−

44 def get_login_loader(self):

38 def get_login_loader(self):

45 return self.select_single("QQuickLoader", objectName="loginLoader")

39 return self.select_single("QQuickLoader", objectName="loginLoader")

46

40

tests/autopilot/unity8/shell/tests/__init__.py+2−3

@@ -378,9 +378,8 @@ class UnityTestCase(AutopilotTestCase):

378 self._proxy = None

379

380 def wait_for_unity(self):

381− greeter_content_loader = self.main_window.wait_select_single(

381+ greeter = self.main_window.wait_select_single(objectName='greeter')

382− objectName='greeterContentLoader')

382+ greeter.waiting.wait_for(False)

383− greeter_content_loader.progress.wait_for(1)

384

383

385 def get_dash(self):

384 def get_dash(self):

386 pid = process_helpers.get_job_pid('unity8-dash')

385 pid = process_helpers.get_job_pid('unity8-dash')

tests/qmltests/tst_TabletShell.qml−1

@@ -191,7 +191,6 @@ Item {

191

192 function selectUser(name) {

193 // Find index of user with the right name

194− var greeter = findChild(shell, "greeterContentLoader")

195 for (var i = 0; i < LightDM.Users.count; i++) {

194 for (var i = 0; i < LightDM.Users.count; i++) {

196 if (LightDM.Users.data(i, LightDM.UserRoles.NameRole) == name) {

195 if (LightDM.Users.data(i, LightDM.UserRoles.NameRole) == name) {

197 break

196 break