Merge lp:~canonical-platform-qa/ubuntu-keyboard/fix_base_class into lp:ubuntu-keyboard

[Leo Arias]

Use the base class from the toolkit in autopilot tests.

Autopilot is currently designed to have a single proxy object base, so we started finding some problems when we integrated tests from multiple projects for the sanity suite. We are working on making autopilot smarter, but in order to be able to change the design without breaking any tests we need this change.
And in this case, it makes sense to use the proxy object from the toolkit, because the one defined for this project was empty.

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

No MPs required.

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

It is.

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

Just made sure that the tests are still passing.

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?

Only changes to automated tests, so no need to run the test plan.

If you changed the UI, was the change specified/approved by design?

No UI changes.

If you changed UI labels, did you update the pot file?

No UI changes.

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

No packaging changes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:359
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/587/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2497
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/88
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2165
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2495
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2495/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19984

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:359
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/588/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2515
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/89
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/89/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2513
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2513/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20003

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

review: Approve (continuous-integration)

[Max Brustkern (nuclearbob)]

I have a couple of questions, but mostly it looks good.

[lp:~canonical-platform-qa/ubuntu-keyboard/fix_base_class]

360. By Leo Arias on 2015-04-29

Reverted the whitespace changes. Will do them in a separate branch.

[Leo Arias (elopio)]

Thanks max. Pushed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:360
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/591/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/92
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2201
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2538
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2538/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20048

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

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes (just ran tests locally, no changes to main app code)

Did CI run pass? If not, please explain why.

 * Unrelated flaky test

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

=== modified file 'tests/autopilot/ubuntu_keyboard/emulators/__init__.py'
--- tests/autopilot/ubuntu_keyboard/emulators/__init__.py	2013-09-26 16:02:12 +0000
+++ tests/autopilot/ubuntu_keyboard/emulators/__init__.py	2015-04-29 19:32:49 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Ubuntu Keyboard Test Suite
-# Copyright (C) 2013 Canonical
+# Copyright (C) 2013, 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
@@ -16,9 +16,3 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
-from autopilot.introspection import CustomEmulatorBase
-
-
-class UbuntuKeyboardEmulatorBase(CustomEmulatorBase):
-    """A base class for all Ubuntu Keyboard emulators."""

=== modified file 'tests/autopilot/ubuntu_keyboard/emulators/key.py'
--- tests/autopilot/ubuntu_keyboard/emulators/key.py	2013-10-10 09:06:50 +0000
+++ tests/autopilot/ubuntu_keyboard/emulators/key.py	2015-04-29 19:32:49 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Ubuntu Keyboard Test Suite
-# Copyright (C) 2013 Canonical
+# Copyright (C) 2013, 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,15 +17,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from ubuntu_keyboard.emulators import UbuntuKeyboardEmulatorBase
-
+import logging
 from collections import namedtuple
-import logging
+
+import ubuntuuitoolkit
 
 logger = logging.getLogger(__name__)
 
 
-class Key(UbuntuKeyboardEmulatorBase):
+class Key(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
     """An emulator that encapsulates details of a keyboard key (i.e. extended
     characters).
 

=== modified file 'tests/autopilot/ubuntu_keyboard/emulators/keyboard.py'
--- tests/autopilot/ubuntu_keyboard/emulators/keyboard.py	2015-03-12 17:34:47 +0000
+++ tests/autopilot/ubuntu_keyboard/emulators/keyboard.py	2015-04-29 19:32:49 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Ubuntu Keyboard Test Suite
-# Copyright (C) 2013 Canonical
+# Copyright (C) 2013, 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
@@ -19,13 +19,13 @@
 
 from collections import defaultdict
 
-from ubuntu_keyboard.emulators import UbuntuKeyboardEmulatorBase
 from ubuntu_keyboard.emulators.keypad import KeyPad
 
 from time import sleep
 import logging
 import os
 
+import ubuntuuitoolkit as toolkit
 from autopilot.input import Pointer, Touch
 from autopilot.introspection import (
     get_proxy_object_for_existing_process,
@@ -114,7 +114,7 @@
             try:
                 Keyboard.__maliit = get_proxy_object_for_existing_process(
                     connection_name='org.maliit.server',
-                    emulator_base=UbuntuKeyboardEmulatorBase
+                    emulator_base=toolkit.UbuntuUIToolkitCustomProxyObjectBase
                 )
 
                 if Keyboard.__maliit is None:

=== modified file 'tests/autopilot/ubuntu_keyboard/emulators/keypad.py'
--- tests/autopilot/ubuntu_keyboard/emulators/keypad.py	2015-03-09 13:07:56 +0000
+++ tests/autopilot/ubuntu_keyboard/emulators/keypad.py	2015-04-29 19:32:49 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Ubuntu Keyboard Test Suite
-# Copyright (C) 2013 Canonical
+# Copyright (C) 2013, 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,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from ubuntu_keyboard.emulators import UbuntuKeyboardEmulatorBase
+import logging
+
+import ubuntuuitoolkit
+
 from ubuntu_keyboard.emulators.key import Key
 
-import logging
 
 logger = logging.getLogger(__name__)
 
@@ -31,7 +33,7 @@
     CAPSLOCK = "CAPSLOCK"
 
 
-class KeyPad(UbuntuKeyboardEmulatorBase):
+class KeyPad(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
     """A basic emulator that provides the details of the keys contained within.
 
     """