@@ -413,13 +413,16 @@ class DashBaseTestCase(AutopilotTestCase):
413 environment = {}
413 environment = {}
415 def setUp(self):
415 def setUp(self):
416+ super(DashBaseTestCase, self).setUp()
418+ if is_unity7_running():
419+ self.useFixture(toolkit_fixtures.HideUnity7Launcher())
416 if model() != 'Desktop':
421 if model() != 'Desktop':
417 process_helpers.restart_unity_with_testability()
422 process_helpers.restart_unity_with_testability()
418 process_helpers.unlock_unity()
423 process_helpers.unlock_unity()
419 self.ensure_dash_not_running()
424 self.ensure_dash_not_running()
421− super(DashBaseTestCase, self).setUp()
423 if self.qml_mock_enabled:
426 if self.qml_mock_enabled:
424 self.environment['QML2_IMPORT_PATH'] = (
427 self.environment['QML2_IMPORT_PATH'] = (
425 get_qml_import_path_with_mock()
428 get_qml_import_path_with_mock()