cb607fd · unity8 · git.iko.soy

on xenial help sign in

Stop using the deprecated toolkit emulators namespace in autopilot tests.

cb607fdLeo Arias12 years ago

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

@@ -1,7 +1,7 @@

1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-

3# Unity Autopilot Test Suite

6# This program is free software: you can redistribute it and/or modify

7# it under the terms of the GNU General Public License as published by

@@ -17,10 +17,10 @@

17# along with this program. If not, see <http://www.gnu.org/licenses/>.

18#

20−from ubuntuuitoolkit import emulators as toolkit_emulators

20+import ubuntuuitoolkit

23−class UnityEmulatorBase(toolkit_emulators.UbuntuUIToolkitEmulatorBase):

23+class UnityEmulatorBase(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):

24 """A base class for all unity emulators."""

tests/autopilot/unity8/shell/emulators/dash.py+1−2

@@ -24,7 +24,6 @@ from unity8.shell import emulators

25from autopilot import logging as autopilot_logging

26from autopilot.introspection import dbus

27−from ubuntuuitoolkit import emulators as toolkit_emulators

30logger = logging.getLogger(__name__)

29logger = logging.getLogger(__name__)

@@ -37,7 +36,7 @@ class DashApp():

37 def __init__(self, app_proxy):

36 def __init__(self, app_proxy):

38 self.app_proxy = app_proxy

37 self.app_proxy = app_proxy

39 self.main_view = self.app_proxy.select_single(

38 self.main_view = self.app_proxy.select_single(

40− toolkit_emulators.MainView)

39+ ubuntuuitoolkit.MainView)

41 self.dash = self.main_view.select_single(Dash)

40 self.dash = self.main_view.select_single(Dash)