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

[Nicholas Skaggs]

Fix AP tests

Fix AP tests

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:529
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/50/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/702/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/50/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

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)]

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.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:530
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/51/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/704/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/51/rebuild

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:531
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/52/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/705/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/52/rebuild

review: Approve (continuous-integration)

=== modified file 'README-Mergeproposal'
--- README-Mergeproposal	2015-12-19 07:34:45 +0000
+++ README-Mergeproposal	2016-03-07 15:16:16 +0000
@@ -26,3 +26,7 @@
 The above checklist is more of a guideline to help file manager app trunk stay buildable,
 stable and up to date.
 
+
+Jenkins
+=======
+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)
 
=== modified file 'tests/autopilot/filemanager/__init__.py'
--- tests/autopilot/filemanager/__init__.py	2016-01-14 16:44:26 +0000
+++ tests/autopilot/filemanager/__init__.py	2016-03-07 15:16:16 +0000
@@ -606,7 +606,7 @@
     """FileDetailsPopover Autopilot emulator."""
 
     def get_path(self):
-        return self.select_single('Label', objectName='pathLabel').text
+        return self.select_single('UCLabel', objectName='pathLabel').text
 
 
 class PathBar(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
=== modified file 'tests/autopilot/filemanager/tests/__init__.py'
--- tests/autopilot/filemanager/tests/__init__.py	2015-03-12 20:58:23 +0000
+++ tests/autopilot/filemanager/tests/__init__.py	2016-03-07 15:16:16 +0000
@@ -32,6 +32,8 @@
 
 import filemanager
 from filemanager import fixture_setup as fm_fixtures
+import gi
+gi.require_version('Click', '0.4')
 from gi.repository import Click
 
 logger = logging.getLogger(__name__)
 
=== modified file 'tests/autopilot/filemanager/tests/test_filemanager.py'
--- tests/autopilot/filemanager/tests/test_filemanager.py	2015-03-10 21:41:40 +0000
+++ tests/autopilot/filemanager/tests/test_filemanager.py	2016-03-07 15:16:16 +0000
@@ -312,13 +312,10 @@
 
     def test_copy_directory(self):
         # Set up a directory to copy and a directory to copy it into.
-        destination_dir_path = os.path.join(self.fakehome,
-                                            'destination')
+        destination_dir_path = self.make_directory_in_home()
         destination_dir_name = os.path.basename(destination_dir_path)
-        os.mkdir(destination_dir_path)
-        dir_to_copy_path = os.path.join(self.fakehome, 'to_copy')
+        dir_to_copy_path = self.make_directory_in_home()
         dir_to_copy_name = os.path.basename(dir_to_copy_path)
-        os.mkdir(dir_to_copy_path)
 
         folder_list_page = self.app.main_view.get_folder_list_page()
         self._assert_number_of_files(2)
@@ -349,13 +346,10 @@
 
     def test_cut_directory(self):
         # Set up a directory to cut and a directory to move it into.
-        destination_dir_path = os.path.join(self.fakehome,
-                                            'destination')
+        destination_dir_path = self.make_directory_in_home()
         destination_dir_name = os.path.basename(destination_dir_path)
-        os.mkdir(destination_dir_path)
-        dir_to_cut_path = os.path.join(self.fakehome, 'to_cut')
+        dir_to_cut_path = self.make_directory_in_home()
         dir_to_cut_name = os.path.basename(dir_to_cut_path)
-        os.mkdir(dir_to_cut_path)
 
         folder_list_page = self.app.main_view.get_folder_list_page()
         self._assert_number_of_files(2)