Merge lp:~ubuntu-sdk-team/ubuntu-ui-extras/ubuntu-ui-extras-no-ap-tests into lp:~ubuntu-sdk-team/ubuntu-ui-extras/trunk

Proposed by Ugo Riboni
Status: Merged
Approved by: Francis Ginther
Approved revision: 48
Merged at revision: 47
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-extras/ubuntu-ui-extras-no-ap-tests
Merge into: lp:~ubuntu-sdk-team/ubuntu-ui-extras/trunk
Diff against target: 263 lines (+0/-195)
12 files modified
debian/control (+0/-9)
debian/qtdeclarative5-ubuntu-ui-extras-plugin-autopilot.install (+0/-1)
debian/qtdeclarative5-ubuntu-ui-extras-plugin.install (+0/-2)
tests/CMakeLists.txt (+0/-1)
tests/autopilot/CMakeLists.txt (+0/-9)
tests/autopilot/ubuntu_ui_extras/__init__.py (+0/-8)
tests/autopilot/ubuntu_ui_extras/example/__init__.py (+0/-8)
tests/autopilot/ubuntu_ui_extras/example/emulators/__init__.py (+0/-6)
tests/autopilot/ubuntu_ui_extras/example/emulators/main_window.py (+0/-20)
tests/autopilot/ubuntu_ui_extras/example/emulators/runner.qml (+0/-25)
tests/autopilot/ubuntu_ui_extras/example/tests/__init__.py (+0/-83)
tests/autopilot/ubuntu_ui_extras/example/tests/test_example.py (+0/-23)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-extras/ubuntu-ui-extras-no-ap-tests
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Łukasz Zemczak Approve
Review via email: mp+181091@code.launchpad.net

Description of the change

Remove the autopilot test and package, since they do nothing for now

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Now it's cool!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

The job has been reconfigured and is working now. Reapprove!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2013-08-19 09:28:17 +0000
+++ debian/control 2013-08-20 16:22:29 +0000
@@ -42,12 +42,3 @@
42 A collection of UI components that for various reasons can't be included in42 A collection of UI components that for various reasons can't be included in
43 the main Ubuntu UI toolkit.43 the main Ubuntu UI toolkit.
4444
45Package: qtdeclarative5-ubuntu-ui-extras-plugin-autopilot
46Architecture: all
47Depends: ${misc:Depends},
48 libautopilot-qt,
49 libqt5test5,
50 qtdeclarative5-ubuntu-ui-extras-plugin (= ${source:Version}),
51Description: Ubuntu UI Extra Components autopilot tests
52 A collection of UI components that for various reasons can't be included in
53 the main Ubuntu UI toolkit. This package contains autopilot tests for them.
5445
=== removed file 'debian/qtdeclarative5-ubuntu-ui-extras-plugin-autopilot.install'
--- debian/qtdeclarative5-ubuntu-ui-extras-plugin-autopilot.install 2013-06-18 13:15:49 +0000
+++ debian/qtdeclarative5-ubuntu-ui-extras-plugin-autopilot.install 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1usr/lib/python*/dist-packages/ubuntu_ui_extras/*
20
=== removed file 'debian/qtdeclarative5-ubuntu-ui-extras-plugin.install'
--- debian/qtdeclarative5-ubuntu-ui-extras-plugin.install 2013-08-19 12:11:22 +0000
+++ debian/qtdeclarative5-ubuntu-ui-extras-plugin.install 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1usr/lib/*/qt5/qml/Ubuntu/Components/Extras
2usr/share/locale/*/LC_MESSAGES/ubuntu-ui-extras.mo
30
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt 2013-06-05 16:23:17 +0000
+++ tests/CMakeLists.txt 2013-08-20 16:22:29 +0000
@@ -1,2 +1,1 @@
1add_subdirectory(autopilot)
2add_subdirectory(unittests)1add_subdirectory(unittests)
32
=== removed directory 'tests/autopilot'
=== removed file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt 2013-06-18 10:49:10 +0000
+++ tests/autopilot/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
1set(AUTOPILOT_DIR ubuntu_ui_extras)
2
3execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
4 OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
5
6install(DIRECTORY ${AUTOPILOT_DIR}
7 DESTINATION ${PYTHON_PACKAGE_DIR}
8 )
9
100
=== removed directory 'tests/autopilot/ubuntu_ui_extras'
=== removed file 'tests/autopilot/ubuntu_ui_extras/__init__.py'
--- tests/autopilot/ubuntu_ui_extras/__init__.py 2013-06-18 10:49:10 +0000
+++ tests/autopilot/ubuntu_ui_extras/__init__.py 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2# Copyright 2013 Canonical
3#
4# This program is free software: you can redistribute it and/or modify it
5# under the terms of the GNU General Public License version 3, as published
6# by the Free Software Foundation.
7
8"""autopilot tests and emulators for ubuntu-ui-extras components- top level package."""
90
=== removed directory 'tests/autopilot/ubuntu_ui_extras/example'
=== removed file 'tests/autopilot/ubuntu_ui_extras/example/__init__.py'
--- tests/autopilot/ubuntu_ui_extras/example/__init__.py 2013-07-02 19:40:38 +0000
+++ tests/autopilot/ubuntu_ui_extras/example/__init__.py 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2# Copyright 2013 Canonical
3#
4# This program is free software: you can redistribute it and/or modify it
5# under the terms of the GNU General Public License version 3, as published
6# by the Free Software Foundation.
7
8"""ubuntu-ui-extras components autopilot tests and emulators - top level package."""
90
=== removed directory 'tests/autopilot/ubuntu_ui_extras/example/emulators'
=== removed file 'tests/autopilot/ubuntu_ui_extras/example/emulators/__init__.py'
--- tests/autopilot/ubuntu_ui_extras/example/emulators/__init__.py 2013-06-10 08:13:32 +0000
+++ tests/autopilot/ubuntu_ui_extras/example/emulators/__init__.py 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2# Copyright 2013 Canonical
3#
4# This program is free software: you can redistribute it and/or modify it
5# under the terms of the GNU General Public License version 3, as published
6# by the Free Software Foundation.
70
=== removed file 'tests/autopilot/ubuntu_ui_extras/example/emulators/main_window.py'
--- tests/autopilot/ubuntu_ui_extras/example/emulators/main_window.py 2013-07-02 19:40:38 +0000
+++ tests/autopilot/ubuntu_ui_extras/example/emulators/main_window.py 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2# Copyright 2013 Canonical
3#
4# This program is free software: you can redistribute it and/or modify it
5# under the terms of the GNU General Public License version 3, as published
6# by the Free Software Foundation.
7
8
9class MainWindow(object):
10 """
11 An emulator class that makes it easy to interact with the example plugin.
12 """
13
14 def __init__(self, app):
15 self.app = app
16
17 def get_qml_view(self):
18 """Get the main QML view"""
19 return self.app.select_single("Example")
20
210
=== removed file 'tests/autopilot/ubuntu_ui_extras/example/emulators/runner.qml'
--- tests/autopilot/ubuntu_ui_extras/example/emulators/runner.qml 2013-07-02 19:40:38 +0000
+++ tests/autopilot/ubuntu_ui_extras/example/emulators/runner.qml 1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
1/*
2 * Copyright 2013 Canonical Ltd.
3 *
4 * This file is part of ubuntu-ui-extras.
5 *
6 * ubuntu-ui-extras is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; version 3.
9 *
10 * ubuntu-ui-extras is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */
18
19import QtQuick 2.0
20import Ubuntu.Components.Extras 0.1
21
22Example {
23 height: 600
24 width: 800
25}
260
=== removed directory 'tests/autopilot/ubuntu_ui_extras/example/tests'
=== removed file 'tests/autopilot/ubuntu_ui_extras/example/tests/__init__.py'
--- tests/autopilot/ubuntu_ui_extras/example/tests/__init__.py 2013-07-02 19:40:38 +0000
+++ tests/autopilot/ubuntu_ui_extras/example/tests/__init__.py 1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2# Copyright 2013 Canonical
3#
4# This program is free software: you can redistribute it and/or modify it
5# under the terms of the GNU General Public License version 3, as published
6# by the Free Software Foundation.
7
8"""ubuntu-ui-extras autopilot tests."""
9
10import os, glob
11import os.path
12import shutil
13import tempfile
14from distutils.sysconfig import get_python_lib
15
16from testtools.matchers import Contains, Equals
17
18from autopilot.input import Mouse, Touch, Pointer
19from autopilot.matchers import Eventually
20from autopilot.platform import model
21from autopilot.testcase import AutopilotTestCase
22
23from ubuntu_ui_extras.example.emulators.main_window import MainWindow
24
25
26class ExampleTestCaseBase(AutopilotTestCase):
27
28 """
29 A common test case class that provides several useful methods
30 for the component tests.
31 """
32
33 if model() == 'Desktop':
34 scenarios = [('with mouse', dict(input_device_class=Mouse)), ]
35 else:
36 scenarios = [('with touch', dict(input_device_class=Touch)), ]
37
38 ARGS = []
39 _temp_pages = []
40 local_location = "ubuntu_ui_extras/example/emulators/runner.qml"
41
42 def setUp(self):
43 self.pointing_device = Pointer(self.input_device_class.create())
44 super(ExampleTestCaseBase, self).setUp()
45
46 if os.path.exists(self.local_location):
47 self.launch_test_local()
48 else:
49 self.launch_test_installed()
50
51 def tearDown(self):
52 super(ExampleTestCaseBase, self).tearDown()
53 for page in self._temp_pages:
54 try:
55 os.remove(page)
56 except:
57 pass
58 self._temp_pages = []
59
60 """Workaround to find the qmlscene binary via shell globbing.
61 This is needed since we can't rely on qt5-default being installed on
62 devices to make qmlscene available in the path"""
63 def qmlscene(self):
64 return glob.glob("/usr/lib/*/qt5/bin/qmlscene")[0]
65
66 def launch_test_local(self):
67 self.app = self.launch_test_application(self.qmlscene(), "-I", "../../modules", self.local_location,
68 *self.ARGS)
69
70 def launch_test_installed(self):
71 runner = os.path.join(get_python_lib(), self.local_location)
72
73 if model() == 'Desktop':
74 self.app = self.launch_test_application(self.qmlscene(), runner, *self.ARGS)
75 else:
76 self.app = self.launch_test_application(self.qmlscene(), runner,
77 self.d_f,
78 *self.ARGS,
79 app_type='qt')
80
81 @property
82 def main_window(self):
83 return MainWindow(self.app)
840
=== removed file 'tests/autopilot/ubuntu_ui_extras/example/tests/test_example.py'
--- tests/autopilot/ubuntu_ui_extras/example/tests/test_example.py 2013-07-02 19:40:38 +0000
+++ tests/autopilot/ubuntu_ui_extras/example/tests/test_example.py 1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
1# -*- coding: utf-8 -*-
2#
3# Copyright 2013 Canonical
4#
5# This program is free software: you can redistribute it and/or modify it
6# under the terms of the GNU General Public License version 3, as published
7# by the Free Software Foundation.
8
9from __future__ import absolute_import
10
11from testtools.matchers import Equals
12from autopilot.matchers import Eventually
13
14from ubuntu_ui_extras.example.tests import ExampleTestCaseBase
15
16
17class TestTabs(ExampleTestCaseBase):
18
19 """Tests tabs management."""
20
21 def test_ensure_something(self):
22 self.assertThat(True, Equals(True))
23 # Add your own real tests here

Subscribers

People subscribed via source and target branches

to all changes: