849c086 · unity8 · git.iko.soy

git.iko.soy/unity8

Fix more autopilot failures

commit849c086e93593c4491fc32392a4715b7e9469f7d authorMichael Terry <michael.terry@canonical.com> dateTue 3 Feb 2015, 12:09 (12 years ago) parent24738c0

3 files changed+13−16

compare with xenial

unifiedsplit

qml/Components/EdgeDemo.qml−1 tests/autopilot/unity8/shell/emulators/greeter.py+5−3 tests/autopilot/unity8/shell/tests/test_lock_screen.py+8−12

qml/Components/EdgeDemo.qml−1

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

145145 }

146146 }

147147

148− onSessionStarted: hide()

149148 onShownChanged: if (!greeter.shown) hide()

150149 }

151150

tests/autopilot/unity8/shell/emulators/greeter.py+5−3

@@ -26,12 +26,14 @@ class Greeter(UnityEmulatorBase):

2626 """An emulator that understands the greeter screen."""

2727

2828 def wait_swiped_away(self):

29− self.showProgress.wait_for(0)

29+ coverPage = self.select_single(objectName='coverPage')

30+ coverPage.showProgress.wait_for(0)

3031

3132 def swipe(self):

3233 """Swipe the greeter screen away."""

33− self.created.wait_for(True)

34− self.showProgress.wait_for(1)

34+ self.waiting.wait_for(False)

35+ coverPage = self.select_single(objectName='coverPage')

36+ coverPage.showProgress.wait_for(1)

3537

3638 rect = self.globalRect

3739 start_x = rect[0] + rect[2] - 3

tests/autopilot/unity8/shell/tests/test_lock_screen.py+8−12

@@ -47,14 +47,13 @@ class TestLockscreen(UnityTestCase):

4747 self.launch_unity()

4848 greeter = self.main_window.get_greeter()

4949

50− if greeter.narrowMode:

50+ if not greeter.tabletMode:

5151 greeter.swipe()

5252 lockscreen = self._wait_for_lockscreen()

5353 self.main_window.enter_pin_code("1234")

54− self.assertThat(lockscreen.shown, Eventually(Equals(False)))

5554 else:

5655 self._enter_prompt_passphrase("1234\n")

57− self.assertThat(greeter.shown, Eventually(Equals(False)))

56+ self.assertThat(greeter.shown, Eventually(Equals(False)))

5857

5958 @with_lightdm_mock("single-passphrase")

6059 def test_can_unlock_passphrase_screen(self):

@@ -62,14 +61,13 @@ class TestLockscreen(UnityTestCase):

6261 self.launch_unity()

6362 greeter = self.main_window.get_greeter()

6463

65− if greeter.narrowMode:

64+ if not greeter.tabletMode:

6665 greeter.swipe()

6766 lockscreen = self._wait_for_lockscreen()

6867 self._enter_pin_passphrase("password")

69− self.assertThat(lockscreen.shown, Eventually(Equals(False)))

7068 else:

7169 self._enter_prompt_passphrase("password")

72− self.assertThat(greeter.shown, Eventually(Equals(False)))

70+ self.assertThat(greeter.shown, Eventually(Equals(False)))

7371

7472 @with_lightdm_mock("single-pin")

7573 def test_pin_screen_wrong_code(self):

@@ -77,18 +75,17 @@ class TestLockscreen(UnityTestCase):

7775 self.launch_unity()

7876 greeter = self.main_window.get_greeter()

7977

80− if greeter.narrowMode:

78+ if not greeter.tabletMode:

8179 greeter.swipe()

8280 lockscreen = self._wait_for_lockscreen()

8381 self.main_window.enter_pin_code("4321")

8482 pinentryField = self.main_window.get_pinentryField()

8583 self.assertThat(pinentryField.text, Eventually(Equals("")))

86− self.assertThat(lockscreen.shown, Eventually(Equals(True)))

8784 else:

8885 self._enter_prompt_passphrase("4231\n")

8986 prompt = self.main_window.get_greeter().get_prompt()

9087 self.assertThat(prompt.text, Eventually(Equals("")))

91− self.assertThat(greeter.shown, Eventually(Equals(True)))

88+ self.assertThat(greeter.shown, Eventually(Equals(True)))

9289

9390 @with_lightdm_mock("single-passphrase")

9491 def test_passphrase_screen_wrong_password(self):

@@ -96,18 +93,17 @@ class TestLockscreen(UnityTestCase):

9693 self.launch_unity()

9794 greeter = self.main_window.get_greeter()

9895

99− if greeter.narrowMode:

96+ if not greeter.tabletMode:

10097 greeter.swipe()

10198 lockscreen = self._wait_for_lockscreen()

10299 self._enter_pin_passphrase("foobar")

103100 pinentryField = self.main_window.get_pinentryField()

104101 self.assertThat(pinentryField.text, Eventually(Equals("")))

105− self.assertThat(lockscreen.shown, Eventually(Equals(True)))

106102 else:

107103 self._enter_prompt_passphrase("foobar")

108104 prompt = self.main_window.get_greeter().get_prompt()

109105 self.assertThat(prompt.text, Eventually(Equals("")))

110− self.assertThat(greeter.shown, Eventually(Equals(True)))

106+ self.assertThat(greeter.shown, Eventually(Equals(True)))

111107

112108 def _wait_for_lockscreen(self):

113109 """Wait for the lock screen to load, and return it."""