Merge lp:~canonical-platform-qa/unity8/fix1341681-toolkit_deprecation into lp:unity8

[Leo Arias]

Stop using the deprecated toolkit emulators namespace in autopilot tests.

This will remove the deprecation warning from the logs.

[lp:~canonical-platform-qa/unity8/fix1341681-toolkit_deprecation]

1657. By Leo Arias on 2015-03-06

Link to the bug.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1657
http://jenkins.qa.ubuntu.com/job/unity8-ci/5396/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1684
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/560
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/561
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/561
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1495
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1682
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1682/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18634

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5396/rebuild

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

 * Are there any related MPs required for this MP to build/function as expected? Please list.

Only the prerequisite. Already approved and added just to avoid potential conflicts.

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Just ran the tests.

 * Did you make sure that your branch does not contain spurious tags?

Yes.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

No changes.

 * If you changed the UI, has there been a design review?

No changes.

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
No, test change only

 * Did CI run pass? If not, please explain why.
No, but tests passed here fine

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

=== modified file 'tests/autopilot/unity8/shell/emulators/__init__.py'
--- tests/autopilot/unity8/shell/emulators/__init__.py	2014-03-27 21:53:12 +0000
+++ tests/autopilot/unity8/shell/emulators/__init__.py	2015-03-06 15:41:48 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2012, 2013, 2014 Canonical
+# Copyright (C) 2012, 2013, 2014, 2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,10 +17,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from ubuntuuitoolkit import emulators as toolkit_emulators
-
-
-class UnityEmulatorBase(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+import ubuntuuitoolkit
+
+
+class UnityEmulatorBase(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
     """A base class for all unity emulators."""
 
 

=== modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
--- tests/autopilot/unity8/shell/emulators/dash.py	2015-03-06 15:41:48 +0000
+++ tests/autopilot/unity8/shell/emulators/dash.py	2015-03-06 15:41:48 +0000
@@ -24,7 +24,6 @@
 
 from autopilot import logging as autopilot_logging
 from autopilot.introspection import dbus
-from ubuntuuitoolkit import emulators as toolkit_emulators
 
 
 logger = logging.getLogger(__name__)
@@ -37,7 +36,7 @@
     def __init__(self, app_proxy):
         self.app_proxy = app_proxy
         self.main_view = self.app_proxy.select_single(
-            toolkit_emulators.MainView)
+            ubuntuuitoolkit.MainView)
         self.dash = self.main_view.select_single(Dash)