Merge lp:~xnox/ubuntu-ui-toolkit/py32ap+listview-scroll_to_bottom+qmlapicheckverbose into lp:ubuntu-ui-toolkit

[Dimitri John Ledkov]

Merge approved branches and resolve conflicts.

Merge approved branches and resolve conflicts.

[Dimitri John Ledkov (xnox)]

This branch merges and resolves conflicts between:
* lp:~xnox/ubuntu-ui-toolkit/py32ap
* lp:~kalikiana/ubuntu-ui-toolkit/qmlapicheckverbose
* lp:~elopio/ubuntu-ui-toolkit/listview-scroll_to_bottom

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:956
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1812/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3603
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3215
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/760
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/760
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/760/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3607
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3607/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3217
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3217/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5596
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4398

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

review: Approve (continuous-integration)

Unmerged revisions

956. By Dimitri John Ledkov on 2014-02-28

Merge lp:~kalikiana/ubuntu-ui-toolkit/qmlapicheckverbose

955. By Dimitri John Ledkov on 2014-02-28

Merge lp:~elopio/ubuntu-ui-toolkit/listview-scroll_to_bottom

=== modified file 'components.api'
--- components.api	2014-02-13 17:22:21 +0000
+++ components.api	2014-02-28 17:59:31 +0000
@@ -566,6 +566,11 @@
 modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml
 Item
     property bool active
+modules/Ubuntu/Test/UbuntuTestCase.qml
+TestCase
+    function findChild(obj,objectName)
+    function findInvisibleChild(obj,objectName)
+    function mouseMoveSlowly(item,x,y,dx,dy,steps,stepdelay)
 plugins.qmltypes
     name: "InverseMouseAreaType"
     prototype: "QQuickMouseArea"
@@ -750,6 +755,24 @@
     Parameter { name: "singular"; type: "string" }
     Parameter { name: "plural"; type: "string" }
     Parameter { name: "n"; type: "int" }
+    name: "ULConditionalLayout"
+    prototype: "QObject"
+    exports: ["ConditionalLayout 0.1"]
+    Property { name: "name"; type: "string" }
+    Property { name: "when"; type: "QQmlBinding"; isPointer: true }
+    Property { name: "layout"; type: "QQmlComponent"; isPointer: true }
+    name: "ULItemLayout"
+    prototype: "QQuickItem"
+    exports: ["ItemLayout 0.1"]
+    Property { name: "item"; type: "string" }
+    name: "ULLayouts"
+    prototype: "QQuickItem"
+    exports: ["Layouts 0.1"]
+    Property { name: "currentLayout"; type: "string"; isReadonly: true }
+    Property { name: "layouts"; type: "ULConditionalLayout"; isList: true; isReadonly: true }
+    name: "ULLayoutsAttached"
+    prototype: "QObject"
+    Property { name: "item"; type: "string" }
     name: "UPMCpuUsage"
     prototype: "QQuickItem"
     exports: ["CpuUsage 0.1"]
 
=== modified file 'debian/control'
--- debian/control	2014-02-12 09:20:43 +0000
+++ debian/control	2014-02-28 17:59:31 +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,
@@ -133,6 +134,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-01-22 16:25:25 +0000
+++ debian/rules	2014-02-28 17:59:31 +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-02-28 17:59:31 +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-07-23 22:15:05 +0000
+++ run_tests.sh	2014-02-28 17:59:31 +0000
@@ -20,9 +20,9 @@
 echo running with arg: $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-02-28 17:59:31 +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-01-30 15:26:21 +0000
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2014-02-28 17:59:31 +0000
@@ -15,7 +15,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-import time
 from distutils import version
 
 import autopilot
@@ -527,7 +526,7 @@
     def click_element(self, objectName):
         """Click an element from the list.
 
-        It swipes the element into view if it's not fully visible.
+        It swipes the element into view if it's center is not visible.
 
         :parameter objectName: The objectName property of the element to click.
 
@@ -537,38 +536,81 @@
         self.pointing_device.click_object(element)
 
     def _swipe_element_into_view(self, objectName):
-        element = self.select_single(objectName=objectName)
-        x, y, width, height = self.globalRect
-        start_x = x + (width / 2)
-        start_y = y + (height / 2)
+        element = self._select_element(objectName)
 
-        while not self._is_element_fully_visible(objectName):
-            stop_x = start_x
+        while not self._is_element_clickable(objectName):
             if element.globalRect.y < self.globalRect.y:
-                stop_y = start_y + element.implicitHeight
-            else:
-                stop_y = start_y - element.implicitHeight
-
-            if platform.model() == 'Desktop':
-                # The drag on the desktop is done two fast, so we are left at
-                # the bottom or at the top of the list, sometimes missing the
-                # element we are looking for.
-                # TODO: use the slow drag once it's implemented:
-                # https://bugs.launchpad.net/autopilot/+bug/1257055
-                # --elopio - 2014-01-09
-                self.pointing_device.move(start_x, start_y)
-                self.pointing_device.press()
-                self.pointing_device.move(stop_x, stop_y)
-                time.sleep(0.3)
-                self.pointing_device.release()
-            else:
-                self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
-
-    def _is_element_fully_visible(self, objectName):
+                self._show_more_elements_above()
+            else:
+                self._show_more_elements_below()
+
+    def _select_element(self, object_name):
+        try:
+            return self.select_single(objectName=object_name)
+        except dbus.StateNotFoundError:
+            # If the list is big, elements will only be created when we scroll
+            # them into view.
+            self._scroll_to_top()
+            while not self.atYEnd:
+                self._show_more_elements_below()
+                try:
+                    return self.select_single(objectName=object_name)
+                except dbus.StateNotFoundError:
+                    pass
+            raise ToolkitEmulatorException(
+                'List element with objectName "{}" not found.'.format(
+                    object_name))
+
+    @autopilot_logging.log_action(logger.info)
+    def _scroll_to_top(self):
+        x, y, width, height = self.globalRect
+        while not self.atYBeginning:
+            self._show_more_elements_above()
+
+    @autopilot_logging.log_action(logger.info)
+    def _show_more_elements_below(self):
+        if self.atYEnd:
+            raise ToolkitEmulatorException('There are no more elements below.')
+        else:
+            self._show_more_elements('below')
+
+    @autopilot_logging.log_action(logger.info)
+    def _show_more_elements_above(self):
+        if self.atYBeginning:
+            raise ToolkitEmulatorException('There are no more elements above.')
+        else:
+            self._show_more_elements('above')
+
+    def _show_more_elements(self, direction):
+        x, y, width, height = self.globalRect
+        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
+        if direction == 'below':
+            start_y = bottom
+            stop_y = top
+        elif direction == 'above':
+            start_y = top
+            stop_y = bottom
+        else:
+            raise ToolkitEmulatorException(
+                'Invalid direction {}.'.format(direction))
+        self._slow_drag(start_x, stop_x, start_y, stop_y)
+        self.dragging.wait_for(False)
+        self.moving.wait_for(False)
+
+    def _slow_drag(self, start_x, stop_x, start_y, stop_y):
+        # If we drag too fast, we end up scrolling more than what we
+        # should, sometimes missing the  element we are looking for.
+        self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate=5)
+
+    def _is_element_clickable(self, objectName):
+        """Return True if the center of the element is visible."""
         element = self.select_single(objectName=objectName)
-        return (element.globalRect.y >= self.globalRect.y and
-                element.globalRect.y + element.globalRect.height <=
-                self.globalRect.y + self.globalRect.height)
+        element_center = element.globalRect.y + element.globalRect.height // 2
+        return (element_center >= self.globalRect.y and
+                element_center <= self.globalRect.y + self.globalRect.height)
 
 
 class Empty(UbuntuUIToolkitEmulatorBase):
@@ -587,7 +629,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)
@@ -599,12 +641,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(
@@ -622,7 +664,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-02-28 17:59:31 +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-01-13 15:23:25 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-02-28 17:59:31 +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
 
@@ -574,47 +577,6 @@
                 text: "No element clicked."
             }
 
-            ListModel {
-                id: testModel
-
-                ListElement {
-                    objectName: "testListElement1"
-                    label: "test list element 1"
-                }
-                ListElement {
-                    objectName: "testListElement2"
-                    label: "test list element 2"
-                }
-                ListElement {
-                    objectName: "testListElement3"
-                    label: "test list element 3"
-                }
-                ListElement {
-                    objectName: "testListElement4"
-                    label: "test list element 4"
-                }
-                ListElement {
-                    objectName: "testListElement5"
-                    label: "test list element 5"
-                }
-                ListElement {
-                    objectName: "testListElement6"
-                    label: "test list element 6"
-                }
-                ListElement {
-                    objectName: "testListElement7"
-                    label: "test list element 7"
-                }
-                ListElement {
-                    objectName: "testListElement8"
-                    label: "test list element 8"
-                }
-                ListElement {
-                    objectName: "testListElement9"
-                    label: "test list element 9"
-                }
-            }
-
             ListView {
                 id: testListView
                 objectName: "testListView"
@@ -622,13 +584,13 @@
                 anchors.right: parent.right
                 height: column.height - clickedLabel.paintedHeight
                 clip: true
-                model: testModel
+                model: 20
 
                 delegate: ListItem.Standard {
-                    text: model.label
-                    objectName: model.objectName
-                    onClicked: clickedLabel.text = model.objectName
-                    height: units.gu(5)
+                        objectName: "testListElement%1".arg(index)
+                        text: "test list element %1".arg(index)
+                        onClicked: clickedLabel.text = objectName
+                        height: units.gu(5)
                 }
             }
         }
@@ -648,32 +610,45 @@
         self.assertIsInstance(self.list_view, emulators.QQuickListView)
 
     def test_click_element(self):
-        self.list_view.click_element('testListElement1')
-        self.assertEqual(self.label.text, 'testListElement1')
+        self.list_view.click_element('testListElement0')
+        self.assertEqual(self.label.text, 'testListElement0')
 
     def test_click_element_outside_view_below(self):
         # Click the first element out of view to make sure we are not scrolling
         # to the bottom at once.
         self.assertFalse(
-            self.list_view._is_element_fully_visible('testListElement5'))
+            self.list_view._is_element_clickable('testListElement5'))
 
         self.list_view.click_element('testListElement5')
         self.assertEqual(self.label.text, 'testListElement5')
 
     def test_click_element_outside_view_above(self):
-        # First we need to scroll to the 8th element in order for the 9th to be
-        # created.
-        self.list_view.click_element('testListElement8')
         self.list_view.click_element('testListElement9')
 
         # Click the first element out of view to make sure we are not scrolling
         # to the top at once.
         self.assertFalse(
-            self.list_view._is_element_fully_visible('testListElement4'))
+            self.list_view._is_element_clickable('testListElement4'))
 
         self.list_view.click_element('testListElement4')
         self.assertEqual(self.label.text, 'testListElement4')
 
+    def test_click_element_not_created_at_start(self):
+        objectName = 'testListElement19'
+        self.assertRaises(
+            dbus.StateNotFoundError,
+            self.list_view.select_single,
+            objectName=objectName)
+        self.list_view.click_element(objectName)
+
+    def test_click_unexisting_element(self):
+        error = self.assertRaises(
+            emulators.ToolkitEmulatorException,
+            self.list_view.click_element,
+            'unexisting')
+        self.assertEqual(
+            str(error), 'List element with objectName "unexisting" not found.')
+
 
 class SwipeToDeleteTestCase(tests.QMLStringAppTestCase):
 
 
=== 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-28 17:59:31 +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-02-28 17:59:31 +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
 
=== added file 'tests/qmlapicheck.sh'
--- tests/qmlapicheck.sh	1970-01-01 00:00:00 +0000
+++ tests/qmlapicheck.sh	2014-02-28 17:59:31 +0000
@@ -0,0 +1,52 @@
+#!/usr/bin/env sh
+#
+# Copyright 2013 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# 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/>.
+#
+################################################################################
+QML="modules/Ubuntu/*/qmldir modules/Ubuntu/Components/Colors/UbuntuColors.qml modules/Ubuntu/Components/*/qmldir modules/Ubuntu/Components/Pickers/PickerPanel.qml"
+CPP="Ubuntu.Components Ubuntu.Layouts Ubuntu.PerformanceMetrics"
+
+echo Dumping QML API of C++ components
+echo '' > plugins.qmltypes
+for i in $CPP; do
+    # Silence spam on stderr due to fonts
+    # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
+    # https://bugreports.qt-project.org/browse/QTBUG-36243
+    qmlplugindump $i 0.1 modules 2>/dev/null >> plugins.qmltypes
+done
+STATUS=$?
+test $STATUS = 0 || ERRORS=1
+test $STATUS = 0 || echo $RESULTS
+
+echo Running QML API check for $QML
+# Palette gets included in Qt 5.2 qmlplugindump even though it's qml
+BUILTINS=QQuick,QQml,U1db::,Palette python3 tests/qmlapicheck.py $QML plugins.qmltypes > components.api.new
+STATUS=$?
+test $STATUS = 0 || ERRORS=1
+test $STATUS = 0 || echo $RESULTS
+
+echo Verifying the diff between existing and generated API
+diff -Fqml -u components.api components.api.new
+STATUS=$?
+test $STATUS = 0 || ERRORS=1
+test $STATUS = 0 || echo $RESULTS
+
+if [ "x$ERRORS" != "x1" ]; then
+    echo API is all fine.
+    exit 0
+else
+    echo API test failed with errors. Did you forget to update components.api?
+    exit 1
+fi
 
=== modified file 'tests/tests.pro'
--- tests/tests.pro	2013-10-30 11:35:57 +0000
+++ tests/tests.pro	2014-02-28 17:59:31 +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-02-28 17:59:31 +0000
@@ -8,11 +8,5 @@
   check.commands += ../../unit/runtest.sh $${TARGET} $${TEST} minimal;
 }
 check.commands += cd ../../..;
-# Silence spam on stderr due to fonts
-# https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
-# https://bugreports.qt-project.org/browse/QTBUG-36243
-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 += diff -Fqml -u components.api components.api.new || exit 1; cd tests/unit
+check.commands += sh tests/qmlapicheck.sh || exit 1;
+check.commands += cd tests/unit
 
=== modified file 'ubuntu-sdk.pro'
--- ubuntu-sdk.pro	2013-12-12 13:01:56 +0000
+++ ubuntu-sdk.pro	2014-02-28 17:59:31 +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