Merge lp:~nskaggs/ubuntu-filemanager-app/fix-ap-tests into lp:ubuntu-filemanager-app

Proposed by Nicholas Skaggs on 2016-03-04
Status: Merged
Approved by: Nicholas Skaggs on 2016-03-10
Approved revision: 531
Merged at revision: 528
Proposed branch: lp:~nskaggs/ubuntu-filemanager-app/fix-ap-tests
Merge into: lp:ubuntu-filemanager-app
Diff against target: 73 lines (+11/-11)
4 files modified
README-Mergeproposal (+4/-0)
tests/autopilot/filemanager/__init__.py (+1/-1)
tests/autopilot/filemanager/tests/__init__.py (+2/-0)
tests/autopilot/filemanager/tests/test_filemanager.py (+4/-10)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-filemanager-app/fix-ap-tests
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve on 2016-03-07
Ubuntu File Manager Developers 2016-03-04 Pending
Review via email: mp+288189@code.launchpad.net

Commit message

Fix AP tests

Description of the change

Fix AP tests

To post a comment you must log in.
review: Approve (continuous-integration)
Nicholas Skaggs (nskaggs) wrote :

Since AP tests don't run on build; I've done a first run here: https://core-apps-jenkins.ubuntu.com/view/Release/job/run-ap-tests-release/9/

Nicholas Skaggs (nskaggs) wrote :

The errors during the run come from system issues surrounding the keyboard; The previous issues have been corrected. Next up, pruning the list of tests.

review: Approve (continuous-integration)
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README-Mergeproposal'
2--- README-Mergeproposal 2015-12-19 07:34:45 +0000
3+++ README-Mergeproposal 2016-03-07 15:16:16 +0000
4@@ -26,3 +26,7 @@
5 The above checklist is more of a guideline to help file manager app trunk stay buildable,
6 stable and up to date.
7
8+
9+Jenkins
10+=======
11+In addition to manual reviews, merge proposals are subject to being run in jenkins to ensure the application builds and any unit tests are successful. For more information on jenkins and how it works, see the [Core Apps Jenkins Wiki](https://wiki.ubuntu.com/Touch/CoreApps/Jenkins)
12
13=== modified file 'tests/autopilot/filemanager/__init__.py'
14--- tests/autopilot/filemanager/__init__.py 2016-01-14 16:44:26 +0000
15+++ tests/autopilot/filemanager/__init__.py 2016-03-07 15:16:16 +0000
16@@ -606,7 +606,7 @@
17 """FileDetailsPopover Autopilot emulator."""
18
19 def get_path(self):
20- return self.select_single('Label', objectName='pathLabel').text
21+ return self.select_single('UCLabel', objectName='pathLabel').text
22
23
24 class PathBar(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
25
26=== modified file 'tests/autopilot/filemanager/tests/__init__.py'
27--- tests/autopilot/filemanager/tests/__init__.py 2015-03-12 20:58:23 +0000
28+++ tests/autopilot/filemanager/tests/__init__.py 2016-03-07 15:16:16 +0000
29@@ -32,6 +32,8 @@
30
31 import filemanager
32 from filemanager import fixture_setup as fm_fixtures
33+import gi
34+gi.require_version('Click', '0.4')
35 from gi.repository import Click
36
37 logger = logging.getLogger(__name__)
38
39=== modified file 'tests/autopilot/filemanager/tests/test_filemanager.py'
40--- tests/autopilot/filemanager/tests/test_filemanager.py 2015-03-10 21:41:40 +0000
41+++ tests/autopilot/filemanager/tests/test_filemanager.py 2016-03-07 15:16:16 +0000
42@@ -312,13 +312,10 @@
43
44 def test_copy_directory(self):
45 # Set up a directory to copy and a directory to copy it into.
46- destination_dir_path = os.path.join(self.fakehome,
47- 'destination')
48+ destination_dir_path = self.make_directory_in_home()
49 destination_dir_name = os.path.basename(destination_dir_path)
50- os.mkdir(destination_dir_path)
51- dir_to_copy_path = os.path.join(self.fakehome, 'to_copy')
52+ dir_to_copy_path = self.make_directory_in_home()
53 dir_to_copy_name = os.path.basename(dir_to_copy_path)
54- os.mkdir(dir_to_copy_path)
55
56 folder_list_page = self.app.main_view.get_folder_list_page()
57 self._assert_number_of_files(2)
58@@ -349,13 +346,10 @@
59
60 def test_cut_directory(self):
61 # Set up a directory to cut and a directory to move it into.
62- destination_dir_path = os.path.join(self.fakehome,
63- 'destination')
64+ destination_dir_path = self.make_directory_in_home()
65 destination_dir_name = os.path.basename(destination_dir_path)
66- os.mkdir(destination_dir_path)
67- dir_to_cut_path = os.path.join(self.fakehome, 'to_cut')
68+ dir_to_cut_path = self.make_directory_in_home()
69 dir_to_cut_name = os.path.basename(dir_to_cut_path)
70- os.mkdir(dir_to_cut_path)
71
72 folder_list_page = self.app.main_view.get_folder_list_page()
73 self._assert_number_of_files(2)

Subscribers

People subscribed via source and target branches