3b5e99c · unity8 · git.iko.soy

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

compare with xenial

unifiedsplit

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

106 self.assert_current_focused_application(application_name)

107

108 self.main_window.show_dash_swiping()

109− self.assert_current_focused_application('')

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

110

111 process_helpers.lock_unity()

112 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):

39 desktop_file_name = os.path.basename(desktop_file_path)

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

41

42+ self.assertEqual(

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

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

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

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

44

45

45 subprocess.check_call(

46 subprocess.check_call(

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

47 self.assert_current_focused_application(application_name)

48 self.assert_current_focused_application(application_name)

48

49

49 self.main_window.show_dash_swiping()

50 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):

412 self.useFixture(toolkit_fixtures.HideUnity7Launcher())

413

414 if model() != 'Desktop':

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

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

415 process_helpers.restart_unity_with_testability()

417 process_helpers.restart_unity_with_testability()

416 process_helpers.unlock_unity()

418 process_helpers.unlock_unity()

419+

417 self.ensure_dash_not_running()

420 self.ensure_dash_not_running()

418

421

419 if self.qml_mock_enabled:

422 if self.qml_mock_enabled: