Merge lp:~ubuntu-core-dev/ubuntu-ui-toolkit/py32ap into lp:ubuntu-ui-toolkit

[Dimitri John Ledkov]

Ship python3 autopilot emulators/tests.

Ship python3 autopilot emulators/tests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:951
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1759/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3425
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3069
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/707
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/707
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/707/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3015
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3428
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3428/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3071
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3071/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5463
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4206

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1759/rebuild

review: Approve (continuous-integration)

[Florian Boucault (fboucault)]

Please link to bug https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1268801
I guess this MR superseeds https://code.launchpad.net/~barry/ubuntu-ui-toolkit/py3ap/+merge/201529 whose commit message is much more complete. Can you use that commit message instead?

Also it says:
"[...] This branch depends on Qt5.2"

Is this MR dependent on 5.2 as well?

[Dimitri John Ledkov (xnox)]

On 24 February 2014 10:49, Florian Boucault
<email address hidden> wrote:
> Please link to bug https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1268801
> I guess this MR superseeds https://code.launchpad.net/~barry/ubuntu-ui-toolkit/py3ap/+merge/201529 whose commit message is much more complete. Can you use that commit message instead?
>
> Also it says:
> "[...] This branch depends on Qt5.2"
>
> Is this MR dependent on 5.2 as well?

no, it does not. I believe that comment was about
lp:ubuntu-ui-toolkit, back at the time of first round of merge
proposals, used to depend on qt5.2, which i don't believe is the case
at present.

--
Regards,

Dimitri.

[Dimitri John Ledkov (xnox)]

I found a few more things i'd like to fix here. Please hold this one for a little while.

[Dimitri John Ledkov (xnox)]

This now is fully python2 & 3 bilingual, with tests passing with same results under either python version.

Please merge and release this asap, as it's on a critical path to remove python2 from the images.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:952
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1761/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3084
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/709
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/709
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/709/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3030
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3444
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3444/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3086
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3086/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5477
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4225

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1761/rebuild

review: Approve (continuous-integration)

[Barry Warsaw (barry)]

I've verified that all my changes from my superseded branch made it into this one. LGTM.

review: Approve

[Barry Warsaw (barry)]

Oops, there's a bug. Not sure how you avoided hitting this, but you'll want to double check your tests.

Traceback (most recent call last):
  File "/usr/lib/python3.4/unittest/loader.py", line 312, in _find_tests
    module = self._get_module_from_name(name)
  File "/usr/lib/python3.4/unittest/loader.py", line 290, in _get_module_from_name
    __import__(name)
  File "/usr/lib/python3/dist-packages/ubuntuuitoolkit/tests/test_fixture_setup.py", line 19, in <module>
    import mock
ImportError: No module named 'mock'

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py 2014-02-12 18:41:20 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py 2014-02-24 23:24:43 +0000
@@ -16,7 +16,12 @@

 import os

-import mock
+try:
+ # Python 3.
+ from unittest import mock
+except ImportError:
+ # Python 2 add-on: python-mock.
+ import mock
 import testtools
 from autopilot import testcase as autopilot_testcase
 from testtools.matchers import Contains, Not, FileExists

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

> Oops, there's a bug. Not sure how you avoided hitting this, but you'll want
> to double check your tests.
>

Ah, i used phablet-test-run and that added mock to my pythonpath.

Patch applied, thanks.

> Traceback (most recent call last):
> File "/usr/lib/python3.4/unittest/loader.py", line 312, in _find_tests
> module = self._get_module_from_name(name)
> File "/usr/lib/python3.4/unittest/loader.py", line 290, in
> _get_module_from_name
> __import__(name)
> File "/usr/lib/python3/dist-
> packages/ubuntuuitoolkit/tests/test_fixture_setup.py", line 19, in <module>
> import mock
> ImportError: No module named 'mock'
>
> === modified file
> 'tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py'
> --- tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py 2014-02-12
> 18:41:20 +0000
> +++ tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py 2014-02-24
> 23:24:43 +0000
> @@ -16,7 +16,12 @@
>
> import os
>
> -import mock
> +try:
> + # Python 3.
> + from unittest import mock
> +except ImportError:
> + # Python 2 add-on: python-mock.
> + import mock
> import testtools
> from autopilot import testcase as autopilot_testcase
> from testtools.matchers import Contains, Not, FileExists

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:953
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1773/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3474/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3112/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/721/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/721/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3477/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3114/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1773/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:954
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1774/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3475
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/722
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/722
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/722/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3055
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3478
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3478/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3115
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3115/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5500
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4254

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1774/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[Zoltan Balogh (bzoltan)]

Please resolve the conflict with the tests/autopilot/ubuntuuitoolkit/emulators.py

review: Needs Fixing

[lp:~ubuntu-core-dev/ubuntu-ui-toolkit/py32ap]

955. By Dimitri John Ledkov on 2014-03-03

Merge trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:955
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1817/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3618
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/765
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/765/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3622
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3622/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3231
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3231/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5608
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4416

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1817/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

back to OK

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-03-01 12:51:13 +0000
+++ debian/control	2014-03-03 09:26:35 +0000
@@ -6,6 +6,7 @@
                devscripts,
                libgles2-mesa-dev,
                libglib2.0-dev,
+               python3,
                python,
                libqt5qml-graphicaleffects | libqt5graphicaleffects5,
                qt5-default,
@@ -22,12 +23,12 @@
                qtdeclarative5-qtfeedback-plugin,
                qtdeclarative5-unity-action-plugin (>= 1.1.0),
                qtdeclarative5-localstorage-plugin,
-         qtdeclarative5-doc-html,
-         qtwebkit5-doc-html,
-         qtsvg5-doc-html,
-         qtscript5-doc-html,
-         qtmultimedia5-doc-html,
-         unity-action-doc,
+               qtdeclarative5-doc-html,
+               qtwebkit5-doc-html,
+               qtsvg5-doc-html,
+               qtscript5-doc-html,
+               qtmultimedia5-doc-html,
+               unity-action-doc,
                devscripts,
                libqt5organizer5,
                qtpim5-dev,
@@ -135,6 +136,8 @@
          python-autopilot (>= 1.4),
          python-fixtures,
          python-mock,
+         python3-fixtures,
+         python3-autopilot (>= 1.4),
          ubuntu-ui-toolkit-examples (>= ${source:Version}),
 Description: Test package for Ubuntu UI Toolkit
  Autopilot tests for the ubuntu-ui-toolkit package

=== modified file 'debian/rules'
--- debian/rules	2014-03-01 12:51:13 +0000
+++ debian/rules	2014-03-03 09:26:35 +0000
@@ -11,6 +11,7 @@
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	mkdir -p debian/tmp/home/run
+	chmod +x tests/xvfb.sh
 	tests/xvfb.sh dh_auto_test || exit $?
 endif
 

=== modified file 'debian/ubuntu-ui-toolkit-autopilot.install'
--- debian/ubuntu-ui-toolkit-autopilot.install	2013-10-30 11:35:57 +0000
+++ debian/ubuntu-ui-toolkit-autopilot.install	2014-03-03 09:26:35 +0000
@@ -1,1 +1,2 @@
-usr/lib/python2.7/dist-packages/ubuntuuitoolkit
+usr/lib/python3
+usr/lib/python2.7

=== modified file 'run_tests.sh'
--- run_tests.sh	2013-09-26 13:12:49 +0000
+++ run_tests.sh	2014-03-03 09:26:35 +0000
@@ -21,9 +21,9 @@
 
 UBUNTU_UI_TOOLKIT_AUTOPILOT_FROM_SOURCE=1
 if [ "$1" == "" ]; then
-	autopilot run ubuntuuitoolkit
+	python3 -m autopilot.run run ubuntuuitoolkit
 else
-	autopilot run -o ../../$1 -f xml -r -rd ../../ ubuntuuitoolkit
+	python3 -m autopilot.run run -o ../../$1 -f xml -r -rd ../../ ubuntuuitoolkit
 fi
 
 exit 0

=== modified file 'tests/autopilot/ubuntuuitoolkit/base.py'
--- tests/autopilot/ubuntuuitoolkit/base.py	2013-11-15 05:11:10 +0000
+++ tests/autopilot/ubuntuuitoolkit/base.py	2014-03-03 09:26:35 +0000
@@ -31,8 +31,9 @@
     # configuration on devices and it seems the environment variable
     # QT_SELECT=qt5 doesn't work for autopilot tests. --Mirv - 2013-10-03
     arch = subprocess.check_output(
-        ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"]).strip()
-    return '/usr/lib/{}/qt5/bin/qmlscene'.format(arch.decode())
+        ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"],
+        universal_newlines=True).strip()
+    return '/usr/lib/{}/qt5/bin/qmlscene'.format(arch)
 
 
 class UbuntuUIToolkitAppTestCase(testcase.AutopilotTestCase):

=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2014-03-01 12:52:42 +0000
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2014-03-03 09:26:35 +0000
@@ -582,7 +582,7 @@
 
     def _show_more_elements(self, direction):
         x, y, width, height = self.globalRect
-        start_x = stop_x = x + (width / 2)
+        start_x = stop_x = x + (width // 2)
         # Start and stop just a little under the top of the list.
         top = y + 5
         bottom = y + height - 5
@@ -607,7 +607,7 @@
     def _is_element_clickable(self, objectName):
         """Return True if the center of the element is visible."""
         element = self.select_single(objectName=objectName)
-        element_center = element.globalRect.y + element.globalRect.height / 2
+        element_center = element.globalRect.y + element.globalRect.height // 2
         return (element_center >= self.globalRect.y and
                 element_center <= self.globalRect.y + self.globalRect.height)
 
@@ -628,7 +628,7 @@
     @autopilot_logging.log_action(logger.info)
     def swipe_to_delete(self, direction='right'):
         """Swipe the item in a specific direction."""
-        if (self.removable):
+        if self.removable:
             self._drag_pointing_device_to_delete(direction)
             if self.confirmRemoval:
                 self.waitingConfirmationForRemoval.wait_for(True)
@@ -640,12 +640,12 @@
 
     def _drag_pointing_device_to_delete(self, direction):
         x, y, w, h = self.globalRect
-        tx = x + (w / 8)
-        ty = y + (h / 2)
+        tx = x + (w // 8)
+        ty = y + (h // 2)
 
-        if (direction == 'right'):
+        if direction == 'right':
             self.pointing_device.drag(tx, ty, w, ty)
-        elif (direction == 'left'):
+        elif direction == 'left':
             self.pointing_device.drag(w - (w*0.1), ty, x, ty)
         else:
             raise ToolkitEmulatorException(
@@ -663,7 +663,7 @@
     @autopilot_logging.log_action(logger.info)
     def confirm_removal(self):
         """Comfirm item removal if this was already swiped."""
-        if (self.waitingConfirmationForRemoval):
+        if self.waitingConfirmationForRemoval:
             deleteButton = self._get_confirm_button()
             self.pointing_device.click_object(deleteButton)
             self._wait_until_deleted()

=== modified file 'tests/autopilot/ubuntuuitoolkit/fixture_setup.py'
--- tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2014-02-12 09:20:43 +0000
+++ tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2014-03-03 09:26:35 +0000
@@ -87,7 +87,7 @@
                 qmlscene=base.get_qmlscene_launch_command(),
                 qml_file_path=qml_file_path))
         desktop_file.write('[Desktop Entry]\n')
-        for key, value in self._desktop_file_dict.iteritems():
+        for key, value in self._desktop_file_dict.items():
             desktop_file.write('{key}={value}\n'.format(key=key, value=value))
         desktop_file.close()
         return desktop_file.name

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-03-01 12:52:15 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-03-03 09:26:35 +0000
@@ -14,7 +14,6 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-import mock
 import time
 import unittest
 
@@ -22,6 +21,10 @@
 from autopilot import input, platform
 from autopilot.introspection import dbus
 from testtools.matchers import GreaterThan, LessThan
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from ubuntuuitoolkit import emulators, tests
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py	2014-02-12 18:41:20 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py	2014-03-03 09:26:35 +0000
@@ -16,7 +16,12 @@
 
 import os
 
-import mock
+try:
+    # Python 3.
+    from unittest import mock
+except ImportError:
+    # Python 2 add-on: python-mock.
+    import mock
 import testtools
 from autopilot import testcase as autopilot_testcase
 from testtools.matchers import Contains, Not, FileExists

=== modified file 'tests/qmlapicheck.py'
--- tests/qmlapicheck.py	2013-12-11 11:28:29 +0000
+++ tests/qmlapicheck.py	2014-03-03 09:26:35 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # Copyright 2013 Canonical Ltd.
@@ -65,7 +65,9 @@
         fileinput.nextfile()
 
 inputfiles.sort()
-for line in fileinput.input(inputfiles):
+
+hook = fileinput.hook_encoded('utf-8')
+for line in fileinput.input(inputfiles, openhook=hook):
     # New file
     if fileinput.isfirstline():
         in_block = 0

=== modified file 'tests/tests.pro'
--- tests/tests.pro	2013-10-30 11:35:57 +0000
+++ tests/tests.pro	2014-03-03 09:26:35 +0000
@@ -1,7 +1,10 @@
 TEMPLATE = subdirs
 SUBDIRS += unit unit_x11
 
-autopilot_module.path = /usr/lib/python2.7/dist-packages/ubuntuuitoolkit
+autopilot_module.path = /usr/lib/python3/dist-packages/ubuntuuitoolkit
 autopilot_module.files = autopilot/ubuntuuitoolkit/*
 
-INSTALLS += autopilot_module
+autopilot2_module.path = /usr/lib/python2.7/dist-packages/ubuntuuitoolkit
+autopilot2_module.files = autopilot/ubuntuuitoolkit/*
+
+INSTALLS += autopilot_module autopilot2_module

=== modified file 'tests/unit/add_qmlmakecheck.pri'
--- tests/unit/add_qmlmakecheck.pri	2014-02-11 12:42:55 +0000
+++ tests/unit/add_qmlmakecheck.pri	2014-03-03 09:26:35 +0000
@@ -14,5 +14,6 @@
 check.commands += qmlplugindump Ubuntu.Components 0.1 modules 2>/dev/null > plugins.qmltypes;
 check.commands += qmlplugindump Ubuntu.PerformanceMetrics 0.1 modules 2>/dev/null >> plugins.qmltypes;
 # Palette gets included in Qt 5.2 qmlplugindump even though it's qml
-check.commands += BUILTINS=QQuick,QQml,U1db::,Palette python tests/qmlapicheck.py modules/Ubuntu/Components/qmldir modules/Ubuntu/Components/Colors/UbuntuColors.qml modules/Ubuntu/Components/Pickers/PickerPanel.qml modules/Ubuntu/Components/*/qmldir modules/Ubuntu/PerformanceMetrics/qmldir plugins.qmltypes > components.api.new;
+
+check.commands += BUILTINS=QQuick,QQml,U1db::,Palette python3 tests/qmlapicheck.py modules/Ubuntu/Components/qmldir modules/Ubuntu/Components/Colors/UbuntuColors.qml modules/Ubuntu/Components/Pickers/PickerPanel.qml modules/Ubuntu/Components/*/qmldir modules/Ubuntu/PerformanceMetrics/qmldir plugins.qmltypes > components.api.new;
 check.commands += diff -Fqml -u components.api components.api.new || exit 1; cd tests/unit

=== modified file 'ubuntu-sdk.pro'
--- ubuntu-sdk.pro	2013-12-12 13:01:56 +0000
+++ ubuntu-sdk.pro	2014-03-03 09:26:35 +0000
@@ -22,10 +22,15 @@
 QMAKE_EXTRA_TARGETS += test_api
 
 test_components.target = test-components
-test_components.commands = cd tests/autopilot; autopilot run ubuntuuitoolkit
+test_components.commands = cd tests/autopilot; python3 -m autopilot.run run ubuntuuitoolkit
 test_components.depends = modules/ubuntu-ui-toolkit.pro
 QMAKE_EXTRA_TARGETS += test_components
 
+test_components2.target = test-components2
+test_components2.commands = cd tests/autopilot; python2 -m autopilot.run run ubuntuuitoolkit
+test_components2.depends = modules/ubuntu-ui-toolkit.pro
+QMAKE_EXTRA_TARGETS += test_components2
+
 qmluitests.target = qmluitests
 qmluitests.commands = cd tests/unit_x11; make check
 qmluitests.depends = modules/ubuntu-ui-toolkit.pro