git.iko.soy/unity8
on xenial help sign in
Stop using the deprecated toolkit emulators namespace in autopilot tests. Fixes: #1341681

Approved by: Albert Astals Cid

commit7c945c20c34d6fa17c493ef9ead9655a5771a317 authorLeo Arias <leo.arias@canonical.com> dateWed 18 Mar 2015, 10:18 (12 years ago) parent0992aa6dc5b313
2 files changed+4−5
compare with xenial
unifiedsplit
tests/autopilot/unity8/shell/emulators/__init__.py+3−3 tests/autopilot/unity8/shell/emulators/dash.py+1−2
tests/autopilot/unity8/shell/emulators/__init__.py+3−3
@@ -1,7 +1,7 @@
11# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
22#
33# Unity Autopilot Test Suite
4−# Copyright (C) 2012, 2013, 2014 Canonical
4+# Copyright (C) 2012, 2013, 2014, 2015 Canonical
55#
66# This program is free software: you can redistribute it and/or modify
77# it under the terms of the GNU General Public License as published by
@@ -17,10 +17,10 @@
1717# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818#
1919
20−from ubuntuuitoolkit import emulators as toolkit_emulators
20+import ubuntuuitoolkit
2121
2222
23−class UnityEmulatorBase(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
23+class UnityEmulatorBase(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
2424 """A base class for all unity emulators."""
2525
2626
tests/autopilot/unity8/shell/emulators/dash.py+1−2
@@ -24,7 +24,6 @@ from unity8.shell import emulators
2424
2525from autopilot import logging as autopilot_logging
2626from autopilot.introspection import dbus
27−from ubuntuuitoolkit import emulators as toolkit_emulators
2827
2928
3029logger = logging.getLogger(__name__)
@@ -37,7 +36,7 @@ class DashApp():
3736 def __init__(self, app_proxy):
3837 self.app_proxy = app_proxy
3938 self.main_view = self.app_proxy.select_single(
40− toolkit_emulators.MainView)
39+ ubuntuuitoolkit.MainView)
4140 self.dash = self.main_view.select_single(Dash)
4241
4342