Ubuntu File Manager App

Merge lp:~barry/ubuntu-filemanager-app/py3autopilot into lp:ubuntu-filemanager-app

  1. py3autopilot
  2. Merge into trunk
Proposed by Barry Warsaw
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 172
Merged at revision: 170
Proposed branch: lp:~barry/ubuntu-filemanager-app/py3autopilot
Merge into: lp:ubuntu-filemanager-app
Diff against target: 111 lines (+7/-15)
5 files modified
debian/control (+2/-2)
tests/autopilot/CMakeLists.txt (+1/-1)
tests/autopilot/filemanager/emulators.py (+3/-9)
tests/autopilot/filemanager/tests/__init__.py (+1/-1)
tests/autopilot/filemanager/tests/test_filemanager.py (+0/-2)
To merge this branch: bzr merge lp:~barry/ubuntu-filemanager-app/py3autopilot
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nicholas Skaggs (community) Approve
Review via email: mp+217969@code.launchpad.net

Commit message

Port the autopilot tests to Python 3.

Description of the change

Port the autopilot tests to Python 3.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:169
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/196/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2379
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/196
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/196
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/146

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/196/rebuild

review: Approve (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Works on device, jenkins, desktop under py2 and py3. Thanks for removing unneeded depends on python for filemanager itself.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-autolanding/66/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2380
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-autolanding/66
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-autolanding/66
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-autolanding/53/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-autolanding/67/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2383
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-autolanding/67
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-autolanding/67
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-autolanding/54/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-autolanding/68/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2392
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-autolanding/68
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-autolanding/68
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-autolanding/55/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-autolanding/69/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2430
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-autolanding/69
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-autolanding/69
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-autolanding/56/console

review: Needs Fixing (continuous-integration)
lp:~barry/ubuntu-filemanager-app/py3autopilot updated
171. By Barry Warsaw

Trunk merge

172. By Barry Warsaw

Restore build-dep

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

barry, I'm going to laugh if you figured out the same thing I did at the same time.. I was playing with this here:

https://code.launchpad.net/~nskaggs/ubuntu-filemanager-app/finish-py3-ap-conversion/+merge/218478

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

So it appears that perhaps the python3 and jenkins issues are resolved.

1) CMakeLists should use python3 to get ${PYTHON_PACKAGE_DIR}
2) The base application needs to depend on python3 in order for it to build properly with cmake under jenkins

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:172
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/202/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2450
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/202
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/202
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/152

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/202/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

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 2014-04-29 13:27:25 +0000
3+++ debian/control 2014-05-06 17:58:10 +0000
4@@ -3,11 +3,11 @@
5 Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
6 Build-Depends: cmake,
7 debhelper (>= 9),
8- python,
9 qtbase5-dev,
10 qtdeclarative5-dev,
11 qt5-default,
12 pkg-kde-tools,
13+ python3-all,
14 libtag1-dev,
15 Standards-Version: 3.9.5
16 Section: misc
17@@ -46,8 +46,8 @@
18 Depends: ${misc:Depends},
19 libautopilot-qt (>= 1.4),
20 libqt5test5,
21- python-mock,
22 ubuntu-filemanager-app (>= ${source:Version}),
23 ubuntu-ui-toolkit-autopilot,
24+ python3-autopilot,
25 Description: Autopilot tests for File Manager Application
26 This package contains the autopilot tests for the File Manager
27
28=== modified file 'tests/autopilot/CMakeLists.txt'
29--- tests/autopilot/CMakeLists.txt 2014-01-31 20:03:12 +0000
30+++ tests/autopilot/CMakeLists.txt 2014-05-06 17:58:10 +0000
31@@ -1,5 +1,5 @@
32 if(INSTALL_TESTS)
33-execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
34+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
35 OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
36
37 install(DIRECTORY ${AUTOPILOT_DIR}
38
39=== modified file 'tests/autopilot/filemanager/emulators.py'
40--- tests/autopilot/filemanager/emulators.py 2014-04-14 18:41:13 +0000
41+++ tests/autopilot/filemanager/emulators.py 2014-05-06 17:58:10 +0000
42@@ -54,7 +54,7 @@
43
44 def get_places_popover(self):
45 """Return the Places popover."""
46- if not(self.internal_wideAspect):
47+ if not self.internal_wideAspect:
48 # XXX It would be easier if the places popover was an object
49 # that inherits from Popover, like the
50 # ActionSelectionPopover does.
51@@ -147,7 +147,7 @@
52
53 """
54 files = self.select_many(FolderListDelegate)
55- if not(self.showingListView):
56+ if not self.showingListView:
57 files = self.select_many(FolderIconDelegate)
58 for file_ in files:
59 if file_.fileName == name:
60@@ -305,7 +305,7 @@
61 # autopilot. Reported on
62 # bug https://bugs.launchpad.net/autopilot/+bug/1195141
63 # --elopio - 2013-07-25
64- raise NotImplementedError()
65+ raise NotImplementedError
66
67 def open_actions_popover(self):
68 """Open the actions popover of the file or folder."""
69@@ -417,16 +417,10 @@
70 class Dialog(ConfirmDialogWithInput):
71 """Dialog Autopilot emulator."""
72
73- def __init__(self, *args):
74- super(Dialog, self).__init__(*args)
75-
76
77 class Popover(ConfirmDialogWithInput):
78 """Popover Autopilot emulator, containing buttons and an inputfield"""
79
80- def __init__(self, *args):
81- super(Popover, self).__init__(*args)
82-
83 def click_button(self, text):
84 """Click a button on the popover.
85
86
87=== modified file 'tests/autopilot/filemanager/tests/__init__.py'
88--- tests/autopilot/filemanager/tests/__init__.py 2014-04-28 21:06:30 +0000
89+++ tests/autopilot/filemanager/tests/__init__.py 2014-05-06 17:58:10 +0000
90@@ -7,7 +7,7 @@
91
92 """Filemanager app autopilot tests."""
93
94-import os.path
95+import os
96 import shutil
97 import tempfile
98 import logging
99
100=== modified file 'tests/autopilot/filemanager/tests/test_filemanager.py'
101--- tests/autopilot/filemanager/tests/test_filemanager.py 2014-04-26 06:35:52 +0000
102+++ tests/autopilot/filemanager/tests/test_filemanager.py 2014-05-06 17:58:10 +0000
103@@ -16,8 +16,6 @@
104
105 """File Manager app autopilot tests."""
106
107-from __future__ import absolute_import
108-
109 import tempfile
110 import unittest
111 import logging

Subscribers

People subscribed via source and target branches