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 on 2013-08-20
Status: Merged
Approved by: Francis Ginther on 2013-08-20
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 on 2013-08-20
Łukasz Zemczak 2013-08-20 Approve on 2013-08-20
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.
Łukasz Zemczak (sil2100) wrote :

Now it's cool!

review: Approve
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
1=== modified file 'debian/control'
2--- debian/control 2013-08-19 09:28:17 +0000
3+++ debian/control 2013-08-20 16:22:29 +0000
4@@ -42,12 +42,3 @@
5 A collection of UI components that for various reasons can't be included in
6 the main Ubuntu UI toolkit.
7
8-Package: qtdeclarative5-ubuntu-ui-extras-plugin-autopilot
9-Architecture: all
10-Depends: ${misc:Depends},
11- libautopilot-qt,
12- libqt5test5,
13- qtdeclarative5-ubuntu-ui-extras-plugin (= ${source:Version}),
14-Description: Ubuntu UI Extra Components autopilot tests
15- A collection of UI components that for various reasons can't be included in
16- the main Ubuntu UI toolkit. This package contains autopilot tests for them.
17
18=== removed file 'debian/qtdeclarative5-ubuntu-ui-extras-plugin-autopilot.install'
19--- debian/qtdeclarative5-ubuntu-ui-extras-plugin-autopilot.install 2013-06-18 13:15:49 +0000
20+++ debian/qtdeclarative5-ubuntu-ui-extras-plugin-autopilot.install 1970-01-01 00:00:00 +0000
21@@ -1,1 +0,0 @@
22-usr/lib/python*/dist-packages/ubuntu_ui_extras/*
23
24=== removed file 'debian/qtdeclarative5-ubuntu-ui-extras-plugin.install'
25--- debian/qtdeclarative5-ubuntu-ui-extras-plugin.install 2013-08-19 12:11:22 +0000
26+++ debian/qtdeclarative5-ubuntu-ui-extras-plugin.install 1970-01-01 00:00:00 +0000
27@@ -1,2 +0,0 @@
28-usr/lib/*/qt5/qml/Ubuntu/Components/Extras
29-usr/share/locale/*/LC_MESSAGES/ubuntu-ui-extras.mo
30
31=== modified file 'tests/CMakeLists.txt'
32--- tests/CMakeLists.txt 2013-06-05 16:23:17 +0000
33+++ tests/CMakeLists.txt 2013-08-20 16:22:29 +0000
34@@ -1,2 +1,1 @@
35-add_subdirectory(autopilot)
36 add_subdirectory(unittests)
37
38=== removed directory 'tests/autopilot'
39=== removed file 'tests/autopilot/CMakeLists.txt'
40--- tests/autopilot/CMakeLists.txt 2013-06-18 10:49:10 +0000
41+++ tests/autopilot/CMakeLists.txt 1970-01-01 00:00:00 +0000
42@@ -1,9 +0,0 @@
43-set(AUTOPILOT_DIR ubuntu_ui_extras)
44-
45-execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
46- OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
47-
48-install(DIRECTORY ${AUTOPILOT_DIR}
49- DESTINATION ${PYTHON_PACKAGE_DIR}
50- )
51-
52
53=== removed directory 'tests/autopilot/ubuntu_ui_extras'
54=== removed file 'tests/autopilot/ubuntu_ui_extras/__init__.py'
55--- tests/autopilot/ubuntu_ui_extras/__init__.py 2013-06-18 10:49:10 +0000
56+++ tests/autopilot/ubuntu_ui_extras/__init__.py 1970-01-01 00:00:00 +0000
57@@ -1,8 +0,0 @@
58-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
59-# Copyright 2013 Canonical
60-#
61-# This program is free software: you can redistribute it and/or modify it
62-# under the terms of the GNU General Public License version 3, as published
63-# by the Free Software Foundation.
64-
65-"""autopilot tests and emulators for ubuntu-ui-extras components- top level package."""
66
67=== removed directory 'tests/autopilot/ubuntu_ui_extras/example'
68=== removed file 'tests/autopilot/ubuntu_ui_extras/example/__init__.py'
69--- tests/autopilot/ubuntu_ui_extras/example/__init__.py 2013-07-02 19:40:38 +0000
70+++ tests/autopilot/ubuntu_ui_extras/example/__init__.py 1970-01-01 00:00:00 +0000
71@@ -1,8 +0,0 @@
72-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
73-# Copyright 2013 Canonical
74-#
75-# This program is free software: you can redistribute it and/or modify it
76-# under the terms of the GNU General Public License version 3, as published
77-# by the Free Software Foundation.
78-
79-"""ubuntu-ui-extras components autopilot tests and emulators - top level package."""
80
81=== removed directory 'tests/autopilot/ubuntu_ui_extras/example/emulators'
82=== removed file 'tests/autopilot/ubuntu_ui_extras/example/emulators/__init__.py'
83--- tests/autopilot/ubuntu_ui_extras/example/emulators/__init__.py 2013-06-10 08:13:32 +0000
84+++ tests/autopilot/ubuntu_ui_extras/example/emulators/__init__.py 1970-01-01 00:00:00 +0000
85@@ -1,6 +0,0 @@
86-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
87-# Copyright 2013 Canonical
88-#
89-# This program is free software: you can redistribute it and/or modify it
90-# under the terms of the GNU General Public License version 3, as published
91-# by the Free Software Foundation.
92
93=== removed file 'tests/autopilot/ubuntu_ui_extras/example/emulators/main_window.py'
94--- tests/autopilot/ubuntu_ui_extras/example/emulators/main_window.py 2013-07-02 19:40:38 +0000
95+++ tests/autopilot/ubuntu_ui_extras/example/emulators/main_window.py 1970-01-01 00:00:00 +0000
96@@ -1,20 +0,0 @@
97-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
98-# Copyright 2013 Canonical
99-#
100-# This program is free software: you can redistribute it and/or modify it
101-# under the terms of the GNU General Public License version 3, as published
102-# by the Free Software Foundation.
103-
104-
105-class MainWindow(object):
106- """
107- An emulator class that makes it easy to interact with the example plugin.
108- """
109-
110- def __init__(self, app):
111- self.app = app
112-
113- def get_qml_view(self):
114- """Get the main QML view"""
115- return self.app.select_single("Example")
116-
117
118=== removed file 'tests/autopilot/ubuntu_ui_extras/example/emulators/runner.qml'
119--- tests/autopilot/ubuntu_ui_extras/example/emulators/runner.qml 2013-07-02 19:40:38 +0000
120+++ tests/autopilot/ubuntu_ui_extras/example/emulators/runner.qml 1970-01-01 00:00:00 +0000
121@@ -1,25 +0,0 @@
122-/*
123- * Copyright 2013 Canonical Ltd.
124- *
125- * This file is part of ubuntu-ui-extras.
126- *
127- * ubuntu-ui-extras is free software; you can redistribute it and/or modify
128- * it under the terms of the GNU General Public License as published by
129- * the Free Software Foundation; version 3.
130- *
131- * ubuntu-ui-extras is distributed in the hope that it will be useful,
132- * but WITHOUT ANY WARRANTY; without even the implied warranty of
133- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
134- * GNU General Public License for more details.
135- *
136- * You should have received a copy of the GNU General Public License
137- * along with this program. If not, see <http://www.gnu.org/licenses/>.
138- */
139-
140-import QtQuick 2.0
141-import Ubuntu.Components.Extras 0.1
142-
143-Example {
144- height: 600
145- width: 800
146-}
147
148=== removed directory 'tests/autopilot/ubuntu_ui_extras/example/tests'
149=== removed file 'tests/autopilot/ubuntu_ui_extras/example/tests/__init__.py'
150--- tests/autopilot/ubuntu_ui_extras/example/tests/__init__.py 2013-07-02 19:40:38 +0000
151+++ tests/autopilot/ubuntu_ui_extras/example/tests/__init__.py 1970-01-01 00:00:00 +0000
152@@ -1,83 +0,0 @@
153-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
154-# Copyright 2013 Canonical
155-#
156-# This program is free software: you can redistribute it and/or modify it
157-# under the terms of the GNU General Public License version 3, as published
158-# by the Free Software Foundation.
159-
160-"""ubuntu-ui-extras autopilot tests."""
161-
162-import os, glob
163-import os.path
164-import shutil
165-import tempfile
166-from distutils.sysconfig import get_python_lib
167-
168-from testtools.matchers import Contains, Equals
169-
170-from autopilot.input import Mouse, Touch, Pointer
171-from autopilot.matchers import Eventually
172-from autopilot.platform import model
173-from autopilot.testcase import AutopilotTestCase
174-
175-from ubuntu_ui_extras.example.emulators.main_window import MainWindow
176-
177-
178-class ExampleTestCaseBase(AutopilotTestCase):
179-
180- """
181- A common test case class that provides several useful methods
182- for the component tests.
183- """
184-
185- if model() == 'Desktop':
186- scenarios = [('with mouse', dict(input_device_class=Mouse)), ]
187- else:
188- scenarios = [('with touch', dict(input_device_class=Touch)), ]
189-
190- ARGS = []
191- _temp_pages = []
192- local_location = "ubuntu_ui_extras/example/emulators/runner.qml"
193-
194- def setUp(self):
195- self.pointing_device = Pointer(self.input_device_class.create())
196- super(ExampleTestCaseBase, self).setUp()
197-
198- if os.path.exists(self.local_location):
199- self.launch_test_local()
200- else:
201- self.launch_test_installed()
202-
203- def tearDown(self):
204- super(ExampleTestCaseBase, self).tearDown()
205- for page in self._temp_pages:
206- try:
207- os.remove(page)
208- except:
209- pass
210- self._temp_pages = []
211-
212- """Workaround to find the qmlscene binary via shell globbing.
213- This is needed since we can't rely on qt5-default being installed on
214- devices to make qmlscene available in the path"""
215- def qmlscene(self):
216- return glob.glob("/usr/lib/*/qt5/bin/qmlscene")[0]
217-
218- def launch_test_local(self):
219- self.app = self.launch_test_application(self.qmlscene(), "-I", "../../modules", self.local_location,
220- *self.ARGS)
221-
222- def launch_test_installed(self):
223- runner = os.path.join(get_python_lib(), self.local_location)
224-
225- if model() == 'Desktop':
226- self.app = self.launch_test_application(self.qmlscene(), runner, *self.ARGS)
227- else:
228- self.app = self.launch_test_application(self.qmlscene(), runner,
229- self.d_f,
230- *self.ARGS,
231- app_type='qt')
232-
233- @property
234- def main_window(self):
235- return MainWindow(self.app)
236
237=== removed file 'tests/autopilot/ubuntu_ui_extras/example/tests/test_example.py'
238--- tests/autopilot/ubuntu_ui_extras/example/tests/test_example.py 2013-07-02 19:40:38 +0000
239+++ tests/autopilot/ubuntu_ui_extras/example/tests/test_example.py 1970-01-01 00:00:00 +0000
240@@ -1,23 +0,0 @@
241-# -*- coding: utf-8 -*-
242-#
243-# Copyright 2013 Canonical
244-#
245-# This program is free software: you can redistribute it and/or modify it
246-# under the terms of the GNU General Public License version 3, as published
247-# by the Free Software Foundation.
248-
249-from __future__ import absolute_import
250-
251-from testtools.matchers import Equals
252-from autopilot.matchers import Eventually
253-
254-from ubuntu_ui_extras.example.tests import ExampleTestCaseBase
255-
256-
257-class TestTabs(ExampleTestCaseBase):
258-
259- """Tests tabs management."""
260-
261- def test_ensure_something(self):
262- self.assertThat(True, Equals(True))
263- # Add your own real tests here

Subscribers

People subscribed via source and target branches

to all changes: