Ubuntu File Manager App

Merge lp:~nskaggs/ubuntu-filemanager-app/ap-binary-support into lp:~dpm/ubuntu-filemanager-app/include-plugin

  1. ap-binary-support
  2. Merge into include-plugin
Proposed by Nicholas Skaggs
Status: Merged
Merged at revision: 169
Proposed branch: lp:~nskaggs/ubuntu-filemanager-app/ap-binary-support
Merge into: lp:~dpm/ubuntu-filemanager-app/include-plugin
Diff against target: 389 lines (+73/-75)
9 files modified
manifest.json (+2/-2)
po/bg.po (+5/-5)
po/cs.po (+4/-4)
po/en_GB.po (+4/-4)
po/fa.po (+9/-9)
po/fi.po (+5/-5)
po/gl.po (+5/-5)
po/id.po (+4/-4)
tests/autopilot/ubuntu_filemanager_app/tests/__init__.py (+35/-37)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-filemanager-app/ap-binary-support
Reviewer Review Type Date Requested Status
David Planella Pending
Review via email: mp+215706@code.launchpad.net

Commit message

Add support to autopilot for binary launching, remove -q option for qml loading, cleanup AP launching

Description of the change

Add support to autopilot for binary launching, remove -q option for qml loading, cleanup AP launching

To post a comment you must log in.
lp:~nskaggs/ubuntu-filemanager-app/ap-binary-support updated
171. By Nicholas Skaggs

rebase to trunk

172. By Nicholas Skaggs

fix flake8

173. By Nicholas Skaggs

fix binary location

174. By Nicholas Skaggs

add back -q option to test launch, fix click launch

175. By Nicholas Skaggs

undo main.cpp changes

176. By Nicholas Skaggs

fix installed qml loc

177. By Nicholas Skaggs

fix -q arg passing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'manifest.json'
2--- manifest.json 2014-04-09 21:01:38 +0000
3+++ manifest.json 2014-04-14 21:50:29 +0000
4@@ -11,9 +11,9 @@
5 },
6 "icon": "filemanager64.png",
7 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
8- "name": "com.ubuntu.filemanager",
9+ "name": "@PROJECT_NAME@",
10 "title": "File Manager",
11- "version": "0.2",
12+ "version": "0.2.@BZR_REVNO@",
13 "x-source": {
14 "vcs-bzr": "lp:ubuntu-filemanager-app",
15 "vcs-bzr-revno": "latest"
16
17=== modified file 'po/bg.po'
18--- po/bg.po 2014-03-21 06:53:03 +0000
19+++ po/bg.po 2014-04-14 21:50:29 +0000
20@@ -8,13 +8,13 @@
21 "Project-Id-Version: ubuntu-filemanager-app\n"
22 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
23 "POT-Creation-Date: 2014-03-10 18:46-0500\n"
24-"PO-Revision-Date: 2014-01-25 16:50+0000\n"
25-"Last-Translator: Gangov <Unknown>\n"
26+"PO-Revision-Date: 2014-04-01 20:00+0000\n"
27+"Last-Translator: Atanas Kovachki <Unknown>\n"
28 "Language-Team: Bulgarian <bg@li.org>\n"
29 "MIME-Version: 1.0\n"
30 "Content-Type: text/plain; charset=UTF-8\n"
31 "Content-Transfer-Encoding: 8bit\n"
32-"X-Launchpad-Export-Date: 2014-03-21 06:52+0000\n"
33+"X-Launchpad-Export-Date: 2014-04-02 06:45+0000\n"
34 "X-Generator: Launchpad (build 16967)\n"
35
36 #: ../ubuntu-filemanager-app.qml:66
37@@ -27,11 +27,11 @@
38
39 #: ../ubuntu-filemanager-app.qml:176
40 msgid "Icons"
41-msgstr ""
42+msgstr "Икони"
43
44 #: ../ubuntu-filemanager-app.qml:176
45 msgid "List"
46-msgstr ""
47+msgstr "Списък"
48
49 #: ../.build/com.ubuntu.filemanager_filemanager.desktop.in:1
50 msgid "File Manager"
51
52=== modified file 'po/cs.po'
53--- po/cs.po 2014-03-21 06:53:03 +0000
54+++ po/cs.po 2014-04-14 21:50:29 +0000
55@@ -8,13 +8,13 @@
56 "Project-Id-Version: ubuntu-filemanager-app\n"
57 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
58 "POT-Creation-Date: 2014-03-10 18:46-0500\n"
59-"PO-Revision-Date: 2014-02-09 10:46+0000\n"
60+"PO-Revision-Date: 2014-04-02 08:21+0000\n"
61 "Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
62 "Language-Team: Czech <cs@li.org>\n"
63 "MIME-Version: 1.0\n"
64 "Content-Type: text/plain; charset=UTF-8\n"
65 "Content-Transfer-Encoding: 8bit\n"
66-"X-Launchpad-Export-Date: 2014-03-21 06:52+0000\n"
67+"X-Launchpad-Export-Date: 2014-04-03 06:02+0000\n"
68 "X-Generator: Launchpad (build 16967)\n"
69
70 #: ../ubuntu-filemanager-app.qml:66
71@@ -27,11 +27,11 @@
72
73 #: ../ubuntu-filemanager-app.qml:176
74 msgid "Icons"
75-msgstr ""
76+msgstr "Ikony"
77
78 #: ../ubuntu-filemanager-app.qml:176
79 msgid "List"
80-msgstr ""
81+msgstr "Seznam"
82
83 #: ../.build/com.ubuntu.filemanager_filemanager.desktop.in:1
84 msgid "File Manager"
85
86=== modified file 'po/en_GB.po'
87--- po/en_GB.po 2014-03-21 06:53:03 +0000
88+++ po/en_GB.po 2014-04-14 21:50:29 +0000
89@@ -8,13 +8,13 @@
90 "Project-Id-Version: ubuntu-filemanager-app\n"
91 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
92 "POT-Creation-Date: 2014-03-10 18:46-0500\n"
93-"PO-Revision-Date: 2014-02-22 11:32+0000\n"
94+"PO-Revision-Date: 2014-03-30 20:23+0000\n"
95 "Last-Translator: Andi Chandler <Unknown>\n"
96 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
97 "MIME-Version: 1.0\n"
98 "Content-Type: text/plain; charset=UTF-8\n"
99 "Content-Transfer-Encoding: 8bit\n"
100-"X-Launchpad-Export-Date: 2014-03-21 06:53+0000\n"
101+"X-Launchpad-Export-Date: 2014-03-31 06:41+0000\n"
102 "X-Generator: Launchpad (build 16967)\n"
103
104 #: ../ubuntu-filemanager-app.qml:66
105@@ -27,11 +27,11 @@
106
107 #: ../ubuntu-filemanager-app.qml:176
108 msgid "Icons"
109-msgstr ""
110+msgstr "Icons"
111
112 #: ../ubuntu-filemanager-app.qml:176
113 msgid "List"
114-msgstr ""
115+msgstr "List"
116
117 #: ../.build/com.ubuntu.filemanager_filemanager.desktop.in:1
118 msgid "File Manager"
119
120=== modified file 'po/fa.po'
121--- po/fa.po 2014-03-21 06:53:03 +0000
122+++ po/fa.po 2014-04-14 21:50:29 +0000
123@@ -8,31 +8,31 @@
124 "Project-Id-Version: ubuntu-filemanager-app\n"
125 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
126 "POT-Creation-Date: 2014-03-10 18:46-0500\n"
127-"PO-Revision-Date: 2013-10-12 06:23+0000\n"
128-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
129+"PO-Revision-Date: 2014-04-11 15:24+0000\n"
130+"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
131 "Language-Team: Persian <fa@li.org>\n"
132 "MIME-Version: 1.0\n"
133 "Content-Type: text/plain; charset=UTF-8\n"
134 "Content-Transfer-Encoding: 8bit\n"
135-"X-Launchpad-Export-Date: 2014-03-21 06:52+0000\n"
136-"X-Generator: Launchpad (build 16967)\n"
137+"X-Launchpad-Export-Date: 2014-04-12 09:42+0000\n"
138+"X-Generator: Launchpad (build 16976)\n"
139
140 #: ../ubuntu-filemanager-app.qml:66
141 msgid "Settings"
142-msgstr ""
143+msgstr "تنظیمات"
144
145 #: ../ubuntu-filemanager-app.qml:67
146 msgid "Change app settings"
147-msgstr ""
148+msgstr "دگرگونی تنظیمات برنامه"
149
150 #: ../ubuntu-filemanager-app.qml:176
151 msgid "Icons"
152-msgstr ""
153+msgstr "شمایل"
154
155 #: ../ubuntu-filemanager-app.qml:176
156 msgid "List"
157-msgstr ""
158+msgstr "فهرست"
159
160 #: ../.build/com.ubuntu.filemanager_filemanager.desktop.in:1
161 msgid "File Manager"
162-msgstr ""
163+msgstr "مدیر پرونده"
164
165=== modified file 'po/fi.po'
166--- po/fi.po 2014-03-21 06:53:03 +0000
167+++ po/fi.po 2014-04-14 21:50:29 +0000
168@@ -8,14 +8,14 @@
169 "Project-Id-Version: ubuntu-filemanager-app\n"
170 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
171 "POT-Creation-Date: 2014-03-10 18:46-0500\n"
172-"PO-Revision-Date: 2014-01-13 21:35+0000\n"
173+"PO-Revision-Date: 2014-04-05 09:54+0000\n"
174 "Last-Translator: Jiri Grönroos <Unknown>\n"
175 "Language-Team: Finnish <fi@li.org>\n"
176 "MIME-Version: 1.0\n"
177 "Content-Type: text/plain; charset=UTF-8\n"
178 "Content-Transfer-Encoding: 8bit\n"
179-"X-Launchpad-Export-Date: 2014-03-21 06:52+0000\n"
180-"X-Generator: Launchpad (build 16967)\n"
181+"X-Launchpad-Export-Date: 2014-04-06 06:53+0000\n"
182+"X-Generator: Launchpad (build 16976)\n"
183
184 #: ../ubuntu-filemanager-app.qml:66
185 msgid "Settings"
186@@ -27,11 +27,11 @@
187
188 #: ../ubuntu-filemanager-app.qml:176
189 msgid "Icons"
190-msgstr ""
191+msgstr "Kuvakkeet"
192
193 #: ../ubuntu-filemanager-app.qml:176
194 msgid "List"
195-msgstr ""
196+msgstr "Luettelo"
197
198 #: ../.build/com.ubuntu.filemanager_filemanager.desktop.in:1
199 msgid "File Manager"
200
201=== modified file 'po/gl.po'
202--- po/gl.po 2014-03-21 06:53:03 +0000
203+++ po/gl.po 2014-04-14 21:50:29 +0000
204@@ -8,14 +8,14 @@
205 "Project-Id-Version: ubuntu-filemanager-app\n"
206 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
207 "POT-Creation-Date: 2014-03-10 18:46-0500\n"
208-"PO-Revision-Date: 2014-01-16 08:38+0000\n"
209+"PO-Revision-Date: 2014-04-08 07:13+0000\n"
210 "Last-Translator: Marcos Lans <Unknown>\n"
211 "Language-Team: Galician <gl@li.org>\n"
212 "MIME-Version: 1.0\n"
213 "Content-Type: text/plain; charset=UTF-8\n"
214 "Content-Transfer-Encoding: 8bit\n"
215-"X-Launchpad-Export-Date: 2014-03-21 06:52+0000\n"
216-"X-Generator: Launchpad (build 16967)\n"
217+"X-Launchpad-Export-Date: 2014-04-09 07:06+0000\n"
218+"X-Generator: Launchpad (build 16976)\n"
219
220 #: ../ubuntu-filemanager-app.qml:66
221 msgid "Settings"
222@@ -27,11 +27,11 @@
223
224 #: ../ubuntu-filemanager-app.qml:176
225 msgid "Icons"
226-msgstr ""
227+msgstr "Iconas"
228
229 #: ../ubuntu-filemanager-app.qml:176
230 msgid "List"
231-msgstr ""
232+msgstr "Lista"
233
234 #: ../.build/com.ubuntu.filemanager_filemanager.desktop.in:1
235 msgid "File Manager"
236
237=== modified file 'po/id.po'
238--- po/id.po 2014-03-21 06:53:03 +0000
239+++ po/id.po 2014-04-14 21:50:29 +0000
240@@ -8,14 +8,14 @@
241 "Project-Id-Version: ubuntu-filemanager-app\n"
242 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
243 "POT-Creation-Date: 2014-03-10 18:46-0500\n"
244-"PO-Revision-Date: 2014-03-02 17:06+0000\n"
245+"PO-Revision-Date: 2014-04-05 04:53+0000\n"
246 "Last-Translator: Dirgita <Unknown>\n"
247 "Language-Team: Indonesian <id@li.org>\n"
248 "MIME-Version: 1.0\n"
249 "Content-Type: text/plain; charset=UTF-8\n"
250 "Content-Transfer-Encoding: 8bit\n"
251-"X-Launchpad-Export-Date: 2014-03-21 06:52+0000\n"
252-"X-Generator: Launchpad (build 16967)\n"
253+"X-Launchpad-Export-Date: 2014-04-06 06:53+0000\n"
254+"X-Generator: Launchpad (build 16976)\n"
255
256 #: ../ubuntu-filemanager-app.qml:66
257 msgid "Settings"
258@@ -31,7 +31,7 @@
259
260 #: ../ubuntu-filemanager-app.qml:176
261 msgid "List"
262-msgstr ""
263+msgstr "Senarai"
264
265 #: ../.build/com.ubuntu.filemanager_filemanager.desktop.in:1
266 msgid "File Manager"
267
268=== modified file 'tests/autopilot/ubuntu_filemanager_app/tests/__init__.py'
269--- tests/autopilot/ubuntu_filemanager_app/tests/__init__.py 2014-02-13 01:56:51 +0000
270+++ tests/autopilot/ubuntu_filemanager_app/tests/__init__.py 2014-04-14 21:50:29 +0000
271@@ -12,12 +12,15 @@
272 import tempfile
273 import logging
274
275+import fixtures
276+from ubuntu_filemanager_app import emulators
277+
278 from autopilot.input import Mouse, Touch, Pointer
279 from autopilot.platform import model
280 from autopilot.testcase import AutopilotTestCase
281-from ubuntu_filemanager_app import emulators
282+from autopilot import logging as autopilot_logging
283+
284 from ubuntuuitoolkit import (
285- base,
286 emulators as toolkit_emulators
287 )
288
289@@ -35,70 +38,65 @@
290 else:
291 scenarios = [('with touch', dict(input_device_class=Touch))]
292
293- local_location = "../../ubuntu-filemanager-app.qml"
294- installed_location = "/usr/share/ubuntu-filemanager-app/" \
295- "ubuntu-filemanager-app.qml"
296-
297- def setup_environment(self):
298- if os.path.exists(self.local_location):
299- logger.debug("Running via local installation")
300- launch = self.launch_test_local
301- test_type = 'local'
302- elif os.path.exists(self.installed_location):
303- logger.debug("Running via installed debian package")
304- launch = self.launch_test_installed
305- test_type = 'deb'
306- else:
307- logger.debug("Running via click package")
308- launch = self.launch_test_click
309- test_type = 'click'
310- return launch, test_type
311+ local_location_binary = '../../src/app/filemanager'
312+ installed_location_binary = '/usr/bin/filemanager'
313+ installed_location_qml = \
314+ '/usr/share/ubuntu-filemanager-app/qml/ubuntu-filemanager-app.qml'
315
316 def setUp(self):
317- launch, self.test_type = self.setup_environment()
318 self._create_test_root()
319 self.pointing_device = Pointer(self.input_device_class.create())
320 super(FileManagerTestCase, self).setUp()
321+
322 #turn off the OSK so it doesn't block screen elements
323 if model() != 'Desktop':
324- os.system("stop maliit-server")
325- self.addCleanup(os.system, "start maliit-server")
326+ os.system('stop maliit-server')
327+ self.addCleanup(os.system, 'start maliit-server')
328
329 self.original_file_count = \
330 len([i for i in os.listdir(os.environ['TESTHOME'])
331 if not i.startswith('.')])
332- logger.debug("Directory Listing for TESTHOME\n%s" %
333+ logger.debug('Directory Listing for TESTHOME\n%s' %
334 os.listdir(os.environ['TESTHOME']))
335- logger.debug("File count in TESTHOME is %s" % self.original_file_count)
336- launch()
337+ logger.debug('File count in TESTHOME is %s' % self.original_file_count)
338+
339+ if os.path.exists(self.local_location_binary):
340+ self.app = self.launch_test_local()
341+ elif os.path.exists(self.installed_location_binary):
342+ self.app = self.launch_test_installed()
343+ else:
344+ self.app = self.launch_test_click()
345
346 def _create_test_root(self):
347 #create a temporary directory for testing purposes
348 #due to security lockdowns, make it under /home always
349- temp_dir = tempfile.mkdtemp(dir=os.path.expanduser("~"))
350+ temp_dir = tempfile.mkdtemp(dir=os.path.expanduser('~'))
351 self.addCleanup(shutil.rmtree, temp_dir)
352- logger.debug("Created root test directory " + temp_dir)
353+ logger.debug('Created root test directory ' + temp_dir)
354 self.patch_environment('TESTHOME', temp_dir)
355- logger.debug("Patched root test directory " + temp_dir)
356 return temp_dir
357
358+ @autopilot_logging.log_action(logger.info)
359 def launch_test_local(self):
360- self.app = self.launch_test_application(
361- base.get_qmlscene_launch_command(),
362- self.local_location,
363+ self.useFixture(fixtures.EnvironmentVariable(
364+ 'QML2_IMPORT_PATH', newvalue='../../src/plugin'))
365+ return self.launch_test_application(
366+ self.local_location_binary,
367 app_type='qt',
368 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
369
370+ @autopilot_logging.log_action(logger.info)
371 def launch_test_installed(self):
372- self.app = self.launch_test_application(
373- base.get_qmlscene_launch_command(),
374- self.installed_location,
375+ return self.launch_test_application(
376+ self.installed_location_binary,
377+ '-q', self.installed_location_qml,
378 app_type='qt',
379 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
380
381+ @autopilot_logging.log_action(logger.info)
382 def launch_test_click(self):
383- self.app = self.launch_click_package(
384- "com.ubuntu.filemanager",
385+ return self.launch_click_package(
386+ 'com.ubuntu.filemanager',
387 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
388
389 @property

Subscribers

People subscribed via source and target branches