3b5e99c · unity8 · git.iko.soy

Updated the lifecycle tests.

commit3b5e99ceb3f378723f4181759cc8a184c29c5f59 authorLeo Arias <leo.arias@canonical.com> dateWed 30 Jul 2014, 23:52 (12 years ago) parent2d35be9

3 files changed+7−3

unifiedsplit

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py+1−1

@@ -106,7 +106,7 @@ class ApplicationLifecycleTests(tests.ApplicationLifeCycleTestCase):

106106 self.assert_current_focused_application(application_name)

107107

108108 self.main_window.show_dash_swiping()

109− self.assert_current_focused_application('')

109+ self.assert_current_focused_application('unity8-dash')

110110

111111 process_helpers.lock_unity()

112112 greeter = self.main_window.get_greeter()

tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py+3−2

@@ -39,7 +39,8 @@ class URLDispatcherTestCase(tests.ApplicationLifeCycleTestCase):

3939 desktop_file_name = os.path.basename(desktop_file_path)

4040 application_name, _ = os.path.splitext(desktop_file_name)

4141

42− self.assertEqual('', self.main_window.get_current_focused_app_id())

42+ self.assertEqual(

43+ 'unity8-dash', self.main_window.get_current_focused_app_id())

4344 self.addCleanup(os.system, 'pkill qmlscene')

4445

4546 subprocess.check_call(

@@ -47,4 +48,4 @@ class URLDispatcherTestCase(tests.ApplicationLifeCycleTestCase):

4748 self.assert_current_focused_application(application_name)

4849

4950 self.main_window.show_dash_swiping()

50− self.assert_current_focused_application('')

51+ self.assert_current_focused_application('unity8-dash')

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

@@ -412,8 +412,11 @@ class DashBaseTestCase(AutopilotTestCase):

412412 self.useFixture(toolkit_fixtures.HideUnity7Launcher())

413413

414414 if model() != 'Desktop':

415+ # On the phone, we need unity to be running and unlocked.

416+ self.addCleanup(process_helpers.stop_job, 'unity8')

415417 process_helpers.restart_unity_with_testability()

416418 process_helpers.unlock_unity()

419+

417420 self.ensure_dash_not_running()

418421

419422 if self.qml_mock_enabled: