git.iko.soy/unity8
on xenial help sign in
Fix lifecycle tests and rename the wait assertion in Greeter emulator.
ff1b2bcMichał Sawicz
tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py+4−2
compare with xenial
unifiedsplit
@@ -97,7 +97,8 @@ class ApplicationLifecycleTests(tests.ApplicationLifeCycleTestCase):
97 self.assertThat(greeter.created, Eventually(Equals(True)))
97 self.assertThat(greeter.created, Eventually(Equals(True)))
98
98
99 application_name = self.launch_fake_app()
99 application_name = self.launch_fake_app()
100− self.assertThat(greeter.created, Eventually(Equals(False)))
100+ greeter.wait_swiped_away()
101+ process_helpers.unlock_unity()
101 self.assert_current_focused_application(application_name)
102 self.assert_current_focused_application(application_name)
102
103
103 def test_greeter_hides_on_app_focus(self):
104 def test_greeter_hides_on_app_focus(self):
@@ -113,7 +114,8 @@ class ApplicationLifecycleTests(tests.ApplicationLifeCycleTestCase):
113 self.assertThat(greeter.created, Eventually(Equals(True)))
114 self.assertThat(greeter.created, Eventually(Equals(True)))
114
115
115 self.launch_upstart_application(application_name)
116 self.launch_upstart_application(application_name)
116− self.assertThat(greeter.created, Eventually(Equals(False)))
117+ greeter.wait_swiped_away()
118+ process_helpers.unlock_unity()
117 self.assert_current_focused_application(application_name)
119 self.assert_current_focused_application(application_name)
118
120
119 def test_click_dash_icon_must_unfocus_application(self):
121 def test_click_dash_icon_must_unfocus_application(self):
tests/autopilot/unity8/process_helpers.py+2−2
@@ -91,7 +91,7 @@ def unlock_unity(unity_proxy_obj=None):
91 logger.info("Failed to unlock greeter")
91 logger.info("Failed to unlock greeter")
92 raise
92 raise
93 else:
93 else:
94− greeter.wait_unlocked()
94+ greeter.created.wait_for(False)
95 logger.info("Greeter unlocked, continuing.")
95 logger.info("Greeter unlocked, continuing.")
96
96
97
97
@@ -193,7 +193,7 @@ def get_job_status(name):
193 ], universal_newlines=True)
193 ], universal_newlines=True)
194 except subprocess.CalledProcessError as error:
194 except subprocess.CalledProcessError as error:
195 raise JobError(
195 raise JobError(
196− "Unable to get {}'s status: {}".format(name, error)
196+ "Unable to get {}'s status: {}".format(name, error)
197 )
197 )
198
198
199
199
tests/autopilot/unity8/shell/emulators/greeter.py+2−2
@@ -25,7 +25,7 @@ from unity8.shell.emulators import UnityEmulatorBase
25class Greeter(UnityEmulatorBase):
25class Greeter(UnityEmulatorBase):
26 """An emulator that understands the greeter screen."""
26 """An emulator that understands the greeter screen."""
27
27
28− def wait_unlocked(self):
28+ def wait_swiped_away(self):
29 self.showProgress.wait_for(0)
29 self.showProgress.wait_for(0)
30
30
31 def swipe(self):
31 def swipe(self):
@@ -40,7 +40,7 @@ class Greeter(UnityEmulatorBase):
40 stop_y = start_y
40 stop_y = start_y
41 self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
41 self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
42
42
43− self.wait_unlocked()
43+ self.wait_swiped_away()
44
44
45 def get_prompt(self):
45 def get_prompt(self):
46 return self.select_single(
46 return self.select_single(