git.iko.soy/unity8
on xenial help sign in
Fix more autopilot failures
849c086Michael Terry
qml/Components/EdgeDemo.qml−1
compare with xenial
unifiedsplit
@@ -145,7 +145,6 @@ Item {
145 }
145 }
146 }
146 }
147
147
148− onSessionStarted: hide()
149 onShownChanged: if (!greeter.shown) hide()
148 onShownChanged: if (!greeter.shown) hide()
150 }
149 }
151
150
tests/autopilot/unity8/shell/emulators/greeter.py+5−3
@@ -26,12 +26,14 @@ class Greeter(UnityEmulatorBase):
26 """An emulator that understands the greeter screen."""
26 """An emulator that understands the greeter screen."""
27
27
28 def wait_swiped_away(self):
28 def wait_swiped_away(self):
29+ coverPage = self.select_single(objectName='coverPage')
29− self.showProgress.wait_for(0)
30+ coverPage.showProgress.wait_for(0)
30
31
31 def swipe(self):
32 def swipe(self):
32 """Swipe the greeter screen away."""
33 """Swipe the greeter screen away."""
33− self.created.wait_for(True)
34+ self.waiting.wait_for(False)
35+ coverPage = self.select_single(objectName='coverPage')
34− self.showProgress.wait_for(1)
36+ coverPage.showProgress.wait_for(1)
35
37
36 rect = self.globalRect
38 rect = self.globalRect
37 start_x = rect[0] + rect[2] - 3
39 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):
47 self.launch_unity()
47 self.launch_unity()
48 greeter = self.main_window.get_greeter()
48 greeter = self.main_window.get_greeter()
49
49
50− if greeter.narrowMode:
50+ if not greeter.tabletMode:
51 greeter.swipe()
51 greeter.swipe()
52 lockscreen = self._wait_for_lockscreen()
52 lockscreen = self._wait_for_lockscreen()
53 self.main_window.enter_pin_code("1234")
53 self.main_window.enter_pin_code("1234")
54− self.assertThat(lockscreen.shown, Eventually(Equals(False)))
55 else:
54 else:
56 self._enter_prompt_passphrase("1234\n")
55 self._enter_prompt_passphrase("1234\n")
57− self.assertThat(greeter.shown, Eventually(Equals(False)))
56+ self.assertThat(greeter.shown, Eventually(Equals(False)))
58
57
59 @with_lightdm_mock("single-passphrase")
58 @with_lightdm_mock("single-passphrase")
60 def test_can_unlock_passphrase_screen(self):
59 def test_can_unlock_passphrase_screen(self):
@@ -62,14 +61,13 @@ class TestLockscreen(UnityTestCase):
62 self.launch_unity()
61 self.launch_unity()
63 greeter = self.main_window.get_greeter()
62 greeter = self.main_window.get_greeter()
64
63
65− if greeter.narrowMode:
64+ if not greeter.tabletMode:
66 greeter.swipe()
65 greeter.swipe()
67 lockscreen = self._wait_for_lockscreen()
66 lockscreen = self._wait_for_lockscreen()
68 self._enter_pin_passphrase("password")
67 self._enter_pin_passphrase("password")
69− self.assertThat(lockscreen.shown, Eventually(Equals(False)))
70 else:
68 else:
71 self._enter_prompt_passphrase("password")
69 self._enter_prompt_passphrase("password")
72− self.assertThat(greeter.shown, Eventually(Equals(False)))
70+ self.assertThat(greeter.shown, Eventually(Equals(False)))
73
71
74 @with_lightdm_mock("single-pin")
72 @with_lightdm_mock("single-pin")
75 def test_pin_screen_wrong_code(self):
73 def test_pin_screen_wrong_code(self):
@@ -77,18 +75,17 @@ class TestLockscreen(UnityTestCase):
77 self.launch_unity()
75 self.launch_unity()
78 greeter = self.main_window.get_greeter()
76 greeter = self.main_window.get_greeter()
79
77
80− if greeter.narrowMode:
78+ if not greeter.tabletMode:
81 greeter.swipe()
79 greeter.swipe()
82 lockscreen = self._wait_for_lockscreen()
80 lockscreen = self._wait_for_lockscreen()
83 self.main_window.enter_pin_code("4321")
81 self.main_window.enter_pin_code("4321")
84 pinentryField = self.main_window.get_pinentryField()
82 pinentryField = self.main_window.get_pinentryField()
85 self.assertThat(pinentryField.text, Eventually(Equals("")))
83 self.assertThat(pinentryField.text, Eventually(Equals("")))
86− self.assertThat(lockscreen.shown, Eventually(Equals(True)))
87 else:
84 else:
88 self._enter_prompt_passphrase("4231\n")
85 self._enter_prompt_passphrase("4231\n")
89 prompt = self.main_window.get_greeter().get_prompt()
86 prompt = self.main_window.get_greeter().get_prompt()
90 self.assertThat(prompt.text, Eventually(Equals("")))
87 self.assertThat(prompt.text, Eventually(Equals("")))
91− self.assertThat(greeter.shown, Eventually(Equals(True)))
88+ self.assertThat(greeter.shown, Eventually(Equals(True)))
92
89
93 @with_lightdm_mock("single-passphrase")
90 @with_lightdm_mock("single-passphrase")
94 def test_passphrase_screen_wrong_password(self):
91 def test_passphrase_screen_wrong_password(self):
@@ -96,18 +93,17 @@ class TestLockscreen(UnityTestCase):
96 self.launch_unity()
93 self.launch_unity()
97 greeter = self.main_window.get_greeter()
94 greeter = self.main_window.get_greeter()
98
95
99− if greeter.narrowMode:
96+ if not greeter.tabletMode:
100 greeter.swipe()
97 greeter.swipe()
101 lockscreen = self._wait_for_lockscreen()
98 lockscreen = self._wait_for_lockscreen()
102 self._enter_pin_passphrase("foobar")
99 self._enter_pin_passphrase("foobar")
103 pinentryField = self.main_window.get_pinentryField()
100 pinentryField = self.main_window.get_pinentryField()
104 self.assertThat(pinentryField.text, Eventually(Equals("")))
101 self.assertThat(pinentryField.text, Eventually(Equals("")))
105− self.assertThat(lockscreen.shown, Eventually(Equals(True)))
106 else:
102 else:
107 self._enter_prompt_passphrase("foobar")
103 self._enter_prompt_passphrase("foobar")
108 prompt = self.main_window.get_greeter().get_prompt()
104 prompt = self.main_window.get_greeter().get_prompt()
109 self.assertThat(prompt.text, Eventually(Equals("")))
105 self.assertThat(prompt.text, Eventually(Equals("")))
110− self.assertThat(greeter.shown, Eventually(Equals(True)))
106+ self.assertThat(greeter.shown, Eventually(Equals(True)))
111
107
112 def _wait_for_lockscreen(self):
108 def _wait_for_lockscreen(self):
113 """Wait for the lock screen to load, and return it."""
109 """Wait for the lock screen to load, and return it."""