Merge lp:~nskaggs/ubuntu-filemanager-app/setup-ap-env into lp:ubuntu-filemanager-app

[Nicholas Skaggs]

Properly setup environment for test running
Fix test in accordance with source changes
Fix flo tests
Restore skipped tests

Properly setup environment for test running by mocking home and tweaking launching
Fix test in accordance with source changes
Fix flo tests
Restore skipped tests

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:173
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/203/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2519/console
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/54/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/153/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/1/console

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:174
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/204/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2520/console
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/55/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/154/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/2/console

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:175
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/205/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2522
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2522/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/57
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/155
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/3

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:176
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/206/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2526
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2526/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/62
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/156
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/4

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

review: Approve (continuous-integration)

[Leo Arias (elopio)]

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:177
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/207/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/68
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/68/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/157
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/5

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-autolanding/71/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/66
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/66/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-autolanding/58
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-autolanding/1

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-filemanager-app/setup-ap-env]

181. By Nicholas Skaggs on 2014-05-08

finish wide UI fixes

182. By Nicholas Skaggs on 2014-05-08

fix local launching

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:180
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/208/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2535
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2535/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/71
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/71/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/158
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/6

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

review: Approve (continuous-integration)

[lp:~nskaggs/ubuntu-filemanager-app/setup-ap-env]

183. By Nicholas Skaggs on 2014-05-08

migrate to ActionSelectionPopover from emulator

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:182
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/209/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2537/console
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/73/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/159/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/7/console

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:183
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/210/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2540/console
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/76/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/160/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/8/console

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

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-filemanager-app/setup-ap-env]

184. By Nicholas Skaggs on 2014-05-08

popover fixes

185. By Nicholas Skaggs on 2014-05-08

flake8 fixes

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:184
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/211/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2542/console
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/78/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/161/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/9/console

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:185
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/212/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2543
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2543/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/79
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/79/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/162
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/10

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

review: Approve (continuous-integration)

[lp:~nskaggs/ubuntu-filemanager-app/setup-ap-env]

186. By Nicholas Skaggs on 2014-05-08

encapsulate all popover calls, remove skip's from tests

187. By Nicholas Skaggs on 2014-05-08

fix typos

188. By Nicholas Skaggs on 2014-05-08

tweaks to _safe_open_popover

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:187
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/213/
Executed test runs:
    None: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2546/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/163/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/11/console

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

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-filemanager-app/setup-ap-env]

189. By Nicholas Skaggs on 2014-05-08

tweaks

190. By Nicholas Skaggs on 2014-05-08

missing ()

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:188
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/214/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2547
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2547/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/164
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/12

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:190
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/215/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2548
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2548/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/84
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/165
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/13

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

review: Approve (continuous-integration)

=== modified file 'src/app/qml/components/AutoSpacedGrid.qml'
--- src/app/qml/components/AutoSpacedGrid.qml	2014-03-29 09:20:11 +0000
+++ src/app/qml/components/AutoSpacedGrid.qml	2014-05-08 23:20:37 +0000
@@ -71,7 +71,8 @@
 
     function calcSpacing(count) {
         var spacing = (width - count * cellWidth)/(count)
-        print("Spacing for count", count, "is", spacing/8, "gu")
+        //this is REALLY spammy on the console, only use for debugging
+        //print("Spacing for count", count, "is", spacing/8, "gu")
         return spacing
     }
 

=== modified file 'tests/autopilot/filemanager/emulators.py'
--- tests/autopilot/filemanager/emulators.py	2014-05-01 18:35:42 +0000
+++ tests/autopilot/filemanager/emulators.py	2014-05-08 23:20:37 +0000
@@ -36,30 +36,39 @@
 
     def get_file_actions_popover(self):
         """Return the ActionSelectionPopover emulator of the file actions."""
-        return self.wait_select_single(
-            ActionSelectionPopover, objectName='fileActionsPopover')
+        return self.get_action_selection_popover('fileActionsPopover')
 
     def get_folder_actions_popover(self):
         """Return the ActionSelectionPopover emulator of the folder actions."""
-        return self.wait_select_single(
-            ActionSelectionPopover, objectName='folderActionsPopover')
+        return self.get_action_selection_popover('folderActionsPopover')
 
     def folder_actions_popover_exists(self):
-        """Boolean, checks if the Actions Popover exists."""
-        popover = self.select_many(
-            ActionSelectionPopover, objectName='folderActionsPopover')
-        if popover == '[]':
-            return True
-        return False
+        """Boolean, checks if the folder actions popover exists."""
+        try:
+            popover = self.get_folder_actions_popover()
+            if popover:
+                return True
+        except:
+            return False
+
+    def file_actions_popover_exists(self):
+        """Boolean, checks if the file actions popover exists."""
+        try:
+            popover = self.get_file_actions_popover()
+            if popover:
+                return True
+        except:
+            return False
 
     def get_places_popover(self):
         """Return the Places popover."""
-        if not self.internal_wideAspect:
+        if not self.showSidebar:
             # XXX It would be easier if the places popover was an object
             # that inherits from Popover, like the
             # ActionSelectionPopover does.
             # --elopio - 2013-07-25
-            return self.select_single('Popover', objectName='placesPopover')
+            return self.wait_select_single('Popover',
+                                           objectName='placesPopover')
         else:
             raise ValueError(
                 'Places sidebar is hidden in wide mode.')
@@ -172,14 +181,14 @@
             return self.select_single(FolderIconView).get_number_of_files()
 
     def get_sidebar(self):
-        if self.main_view.internal_wideAspect:
+        if self.main_view.showSidebar:
             return self.select_single(PlacesSidebar)
         else:
             raise ValueError(
                 'Places sidebar is hidden in small mode.')
 
     def get_pathbar(self):
-        if self.main_view.internal_wideAspect:
+        if self.main_view.showSidebar:
             return self.main_view.get_toolbar().select_single(PathBar)
         else:
             raise ValueError(
@@ -200,7 +209,7 @@
 
     def _split_header_text(self):
         header_text = self.select_single(
-            'Header', objectName='directoryHeader').text
+            'Header', objectName='listViewSmallHeader').text
         match = re.match(self.SPLIT_HEADER_REGEX, header_text)
         if match:
             path = match.group(1)
@@ -270,13 +279,8 @@
         """Open the actions popover of the file or folder."""
         self.pointing_device.move_to_object(self)
         self.pointing_device.press()
-        time.sleep(1)
+        time.sleep(2)
         self.pointing_device.release()
-        # TODO wait for the popover to be opened. For this we would need to
-        # access the MainView, but that's not currently possible with
-        # autopilot. Reported on
-        # https://bugs.launchpad.net/autopilot/+bug/1195141
-        # --elopio - 2013-07-25
 
 
 class FolderIconDelegate(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
@@ -311,13 +315,8 @@
         """Open the actions popover of the file or folder."""
         self.pointing_device.move_to_object(self)
         self.pointing_device.press()
-        time.sleep(1)
+        time.sleep(2)
         self.pointing_device.release()
-        # TODO wait for the popover to be opened. For this we would need to
-        # access the MainView, but that's not currently possible with
-        # autopilot. Reported on
-        # https://bugs.launchpad.net/autopilot/+bug/1195141
-        # --elopio - 2013-07-25
 
 
 class FileActionDialog(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
@@ -336,37 +335,6 @@
         self.pointing_device.click_object(cancel_button)
 
 
-class ActionSelectionPopover(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
-    """ActionSelectionPopover Autopilot emulator."""
-    # TODO Move this to the ubuntu-ui-toolkit. Reported on
-    # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205205
-    # --elopio - 2013-07-25
-
-    def __init__(self, *args):
-        super(ActionSelectionPopover, self).__init__(*args)
-        self.pointing_device = toolkit_emulators.get_pointing_device()
-
-    def click_button(self, text):
-        """Click a button on the popover.
-
-        XXX We are receiving the text because there's no way to set the
-        objectName on the action. This is reported at
-        https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205144
-        --elopio - 2013-07-25
-
-        :parameter text: The text of the button.
-
-        """
-        button = self._get_button(text)
-        self.pointing_device.click_object(button)
-
-    def _get_button(self, text):
-        buttons = self.select_many('Empty')
-        for button in buttons:
-            if button.text == text:
-                return button
-
-
 class ConfirmDialog(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
     """ConfirmDialog Autopilot emulator."""
 

=== modified file 'tests/autopilot/filemanager/tests/__init__.py'
--- tests/autopilot/filemanager/tests/__init__.py	2014-05-01 18:35:42 +0000
+++ tests/autopilot/filemanager/tests/__init__.py	2014-05-08 23:20:37 +0000
@@ -9,7 +9,6 @@
 
 import os
 import shutil
-import tempfile
 import logging
 
 import fixtures
@@ -21,7 +20,8 @@
 from autopilot import logging as autopilot_logging
 
 from ubuntuuitoolkit import (
-    emulators as toolkit_emulators
+    emulators as toolkit_emulators,
+    fixture_setup as toolkit_fixtures
 )
 
 logger = logging.getLogger(__name__)
@@ -38,8 +38,28 @@
     else:
         scenarios = [('with touch', dict(input_device_class=Touch))]
 
+    local_location = os.path.dirname(os.path.dirname(os.getcwd()))
+    local_location_qml = os.path.join(local_location,
+                                      'src/app/qml/filemanager.qml')
+    local_location_binary = os.path.join(local_location, 'src/app/filemanager')
+    installed_location_qml = "/usr/share/filemanager/qml/filemanager.qml"
+    installed_location_binary = '/usr/bin/filemanager'
+
+    def get_launcher_and_type(self):
+        if os.path.exists(self.local_location_binary):
+            launcher = self.launch_test_local
+            test_type = 'local'
+        elif os.path.exists(self.installed_location_binary):
+            launcher = self.launch_test_installed
+            test_type = 'deb'
+        else:
+            launcher = self.launch_test_click
+            test_type = 'click'
+        return launcher, test_type
+
     def setUp(self):
-        self._create_test_root()
+        launcher, self.test_type = self.get_launcher_and_type()
+        self.home_dir = self._patch_home()
         self.pointing_device = Pointer(self.input_device_class.create())
         super(FileManagerTestCase, self).setUp()
 
@@ -49,51 +69,22 @@
             self.addCleanup(os.system, 'start maliit-server')
 
         self.original_file_count = \
-            len([i for i in os.listdir(os.environ['TESTHOME'])
+            len([i for i in os.listdir(self.home_dir)
                  if not i.startswith('.')])
-        logger.debug('Directory Listing for TESTHOME\n%s' %
-                     os.listdir(os.environ['TESTHOME']))
-        logger.debug('File count in TESTHOME is %s' % self.original_file_count)
-
-        self.EXEC = 'filemanager'
-        self.source_dir = os.path.dirname(
-            os.path.dirname(os.path.abspath('.')))
-        self.build_dir = self._get_build_dir()
-        self.local_location_binary = os.path.join(self.build_dir,
-                                                  'src', 'app', self.EXEC)
-        self.installed_location_binary = os.path.join('/usr/bin/', self.EXEC)
-        self.installed_location_qml = \
-            '/usr/share/filemanager/qml/filemanager.qml'
-
-        if os.path.exists(self.local_location_binary):
-            self.app = self.launch_test_local()
-        elif os.path.exists(self.installed_location_binary):
-            self.app = self.launch_test_installed()
-        else:
-            self.app = self.launch_test_click()
-
-    def _get_build_dir(self):
-        build_dir = self.source_dir
-
-        return build_dir
-
-    def _create_test_root(self):
-        #create a temporary directory for testing purposes
-        #due to security lockdowns, make it under /home always
-        temp_dir = tempfile.mkdtemp(dir=os.path.expanduser('~'))
-        self.addCleanup(shutil.rmtree, temp_dir)
-        logger.debug('Created root test directory ' + temp_dir)
-        self.patch_environment('TESTHOME', temp_dir)
-        return temp_dir
+        logger.debug('Directory Listing for HOME\n%s' %
+                     os.listdir(self.home_dir))
+        logger.debug('File count in HOME is %s' % self.original_file_count)
+
+        self.app = launcher()
 
     @autopilot_logging.log_action(logger.info)
     def launch_test_local(self):
         self.useFixture(fixtures.EnvironmentVariable(
-            'QML2_IMPORT_PATH', newvalue=os.path.join(self.build_dir,
+            'QML2_IMPORT_PATH', newvalue=os.path.join(self.local_location,
                                                       'src', 'plugin')))
-
         return self.launch_test_application(
             self.local_location_binary,
+            '-q', self.local_location_qml,
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
@@ -111,6 +102,42 @@
             'com.ubuntu.filemanager',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
+    def _copy_xauthority_file(self, directory):
+        """ Copy .Xauthority file to directory, if it exists in /home
+        """
+        xauth = os.path.expanduser(os.path.join('~', '.Xauthority'))
+        if os.path.isfile(xauth):
+            logger.debug("Copying .Xauthority to " + directory)
+            shutil.copyfile(
+                os.path.expanduser(os.path.join('~', '.Xauthority')),
+                os.path.join(directory, '.Xauthority'))
+
+    def _patch_home(self):
+        """ mock /home for testing purposes to preserve user data
+        """
+        temp_dir_fixture = fixtures.TempDir()
+        self.useFixture(temp_dir_fixture)
+        temp_dir = temp_dir_fixture.path
+
+        #If running under xvfb, as jenkins does,
+        #xsession will fail to start without xauthority file
+        #Thus if the Xauthority file is in the home directory
+        #make sure we copy it to our temp home directory
+        self._copy_xauthority_file(temp_dir)
+
+        #click requires using initctl env (upstart), but the desktop can set
+        #an environment variable instead
+        if self.test_type == 'click':
+            self.useFixture(toolkit_fixtures.InitctlEnvironmentVariable(
+                            HOME=temp_dir))
+        else:
+            self.useFixture(fixtures.EnvironmentVariable('HOME',
+                                                         newvalue=temp_dir))
+
+        logger.debug("Patched home to fake home directory " + temp_dir)
+
+        return temp_dir
+
     @property
     def main_view(self):
-        return self.app.select_single(emulators.MainView)
+        return self.app.wait_select_single(emulators.MainView)

=== modified file 'tests/autopilot/filemanager/tests/test_filemanager.py'
--- tests/autopilot/filemanager/tests/test_filemanager.py	2014-05-01 18:35:42 +0000
+++ tests/autopilot/filemanager/tests/test_filemanager.py	2014-05-08 23:20:37 +0000
@@ -39,31 +39,29 @@
         super(TestFolderListPage, self).setUp()
         self.assertThat(
             self.main_view.visible, Eventually(Equals(True)))
-        #start in testhome everytime
-        self._go_to_location(os.environ['TESTHOME'])
-
-    def _make_file_in_testhome(self):
-        return self._make_content_in_testhome('file')
-
-    def _make_content_in_testhome(self, type_):
+
+    def _make_file_in_home(self):
+        return self._make_content_in_home('file')
+
+    def _make_content_in_home(self, type_):
         if type_ != 'file' and type_ != 'directory':
             raise ValueError('Unknown content type: "{0}"', type_)
         if type_ == 'file':
             _, path = tempfile.mkstemp(prefix='tmpfm',
-                                       dir=os.environ['TESTHOME'])
-            #path = os.environ['TESTHOME'] + "/tmpfmFile"
+                                       dir=self.home_dir)
+            #path = self.home_dir + "/tmpfmFile"
             #os.system("touch " + path)
-            logger.debug("Created %s, a file in TESTHOME" % path)
+            logger.debug("Created %s, a file in HOME" % path)
             self.addCleanup(self._unlink_cleanup, path)
         else:
-            path = tempfile.mkdtemp(prefix='tmpfm', dir=os.environ['TESTHOME'])
-            #path = os.environ['TESTHOME'] + "/tmpfmDir"
+            path = tempfile.mkdtemp(prefix='tmpfm', dir=self.home_dir)
+            #path = self.home_dir + "/tmpfmDir"
             #os.system("mkdir " + path)
-            logger.debug("Created %s, a directory in TESTHOME" % path)
+            logger.debug("Created %s, a directory in HOME" % path)
             self.addCleanup(self._rmdir_cleanup, path)
 
-        logger.debug("Directory Listing for TESTHOME\n%s" %
-                     os.listdir(os.environ['TESTHOME']))
+        logger.debug("Directory Listing for HOME\n%s" %
+                     os.listdir(self.home_dir))
         self._assert_number_of_files(1)
         return path
 
@@ -100,29 +98,31 @@
         # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205201
         # --elopio - 2013-07-25
         place = None
-        if self.main_view.internal_wideAspect:
+        if self.main_view.showSidebar:
             place = (self.main_view.get_folder_list_page().get_sidebar()
                      .get_place(text))
         else:
-            self.main_view.open_toolbar()
-            self.main_view.get_toolbar().click_button('places')
+            open_popover = lambda: \
+                self.main_view.open_toolbar().click_button('places')
+            self._safe_open_popover(open_popover)
             place = self._get_place(text)
         self.pointing_device.click_object(place)
 
     def _go_to_location(self, location):
         #go to specified location
-        toolbar = self.main_view.open_toolbar()
         #on wide UI display, we get the location dialog
         #on phone UI display, we get places popover
         device = model()
-        if self.main_view.internal_wideAspect:
+        if self.main_view.showSidebar:
             logger.debug("Using goto to goto %s on %s" % (location, device))
             (self.main_view.get_folder_list_page().get_pathbar()
                 .go_to_location())
             goto_location = self.main_view.get_dialog()
         else:
             logger.debug("Using places to goto %s on %s" % (location, device))
-            toolbar.click_button('places')
+            open_popover = lambda: \
+                self.main_view.open_toolbar().click_button('places')
+            self._safe_open_popover(open_popover)
             goto_location = self.main_view.get_popover()
         goto_location.enter_text(location)
         goto_location.ok()
@@ -136,8 +136,8 @@
         raise ValueError(
             'Place "{0}" not found.'.format(text))
 
-    def _make_directory_in_testhome(self):
-        return self._make_content_in_testhome('directory')
+    def _make_directory_in_home(self):
+        return self._make_content_in_home('directory')
 
     def _open_directory(self, item):
         expected_path = item.filePath
@@ -148,11 +148,34 @@
         self.assertThat(
             list_view.get_current_path, Eventually(Equals(expected_path)))
 
+    def _check_popover_exists(self):
+        """Boolean, checks if popover exists."""
+        try:
+            popover = \
+                self.main_view.wait_select_single('ActionSelectionPopover')
+            if popover:
+                return True
+        except:
+                try:
+                    popover = self.main_view.wait_select_single('Popover')
+                    if popover:
+                        return True
+                except:
+                    return False
+
+    def _safe_open_popover(self, popover_open_function):
+        timeout = 0
+        popover_exists = False
+        while timeout < 3 and not popover_exists:
+            popover_open_function()
+            popover_exists = self._check_popover_exists()
+            timeout += 1
+
     def _do_action_on_file(self, file_, action):
         logger.debug("Performing %s on file %s" % (action, file_))
-        file_.open_actions_popover()
+        self._safe_open_popover(file_.open_actions_popover)
         file_actions_popover = self.main_view.get_file_actions_popover()
-        file_actions_popover.click_button(action)
+        file_actions_popover.click_button_by_text(action)
 
     def _cancel_confirm_dialog(self):
         confirm_dialog = self.main_view.get_confirm_dialog()
@@ -181,7 +204,7 @@
     # see https://bugs.launchpad.net/autopilot/+bug/1209004
     @unittest.skip("Can't do this properly on desktop or phablet")
     def test_open_file(self):
-        self._make_file_in_testhome()
+        self._make_file_in_home()
 
         first_file = self._get_file_by_index(0)
         self.pointing_device.click_object(first_file)
@@ -215,10 +238,10 @@
         window.close()
 
     def test_rename_directory(self):
-        orig_dir = os.path.basename(self._make_directory_in_testhome())
+        orig_dir = os.path.basename(self._make_directory_in_home())
         new_name = 'Renamed directory'
         self.addCleanup(self._rmdir_cleanup,
-                        os.path.join(os.environ['TESTHOME'], new_name))
+                        os.path.join(self.home_dir, new_name))
 
         first_dir = self._get_file_by_name(orig_dir)
         self._do_action_on_file(first_dir, action='Rename')
@@ -230,7 +253,7 @@
                         Eventually(Equals(new_name)))
 
     def test_open_directory(self):
-        dir_path = self._make_directory_in_testhome()
+        dir_path = self._make_directory_in_home()
         first_dir = self._get_file_by_name(os.path.basename(dir_path))
 
         self._open_directory(first_dir)
@@ -244,20 +267,19 @@
 
     def test_folder_context_menu_shows(self):
         """Checks to make sure that the folder actions popover is shown."""
-        dir_path = os.path.basename(self._make_directory_in_testhome())
+        dir_path = os.path.basename(self._make_directory_in_home())
 
         first_file = self._get_file_by_name(dir_path)
-        first_file.open_actions_popover()
+        self._safe_open_popover(first_file.open_actions_popover)
 
         file_actions_popover = self.main_view.get_file_actions_popover()
         self.assertThat(
             lambda: file_actions_popover.visible, Eventually(Equals(True)))
 
-    @unittest.skip("Fails in lab due to lab issues not present on phone")
     def test_list_folder_contents(self):
-        dir_path = self._make_directory_in_testhome()
+        dir_path = self._make_directory_in_home()
         dir_name = os.path.basename(dir_path)
-        file_path = self._make_file_in_testhome()
+        file_path = self._make_file_in_home()
         file_name = os.path.basename(file_path)
 
         self._assert_number_of_files(2)
@@ -269,7 +291,7 @@
         self.assertThat(file_.fileName, Eventually(Equals(file_name)))
 
     def test_cancel_rename_directory(self):
-        dir_path = self._make_directory_in_testhome()
+        dir_path = self._make_directory_in_home()
         dir_name = os.path.basename(dir_path)
 
         first_dir = self._get_file_by_name(dir_name)
@@ -282,7 +304,7 @@
             lambda: first_dir.fileName, Eventually(Equals(dir_name)))
 
     def test_cancel_rename_file(self):
-        file_path = self._make_file_in_testhome()
+        file_path = self._make_file_in_home()
         file_name = os.path.basename(file_path)
 
         first_file = self._get_file_by_name(file_name)
@@ -296,7 +318,7 @@
             Eventually(Equals(file_name)))
 
     def test_rename_file(self):
-        file_name = os.path.basename(self._make_file_in_testhome())
+        file_name = os.path.basename(self._make_file_in_home())
         new_name = 'Renamed file'
         self.addCleanup(self._unlink_cleanup, new_name)
 
@@ -310,7 +332,7 @@
                         Eventually(Equals(new_name)))
 
     def test_cancel_delete_directory(self):
-        dir_name = os.path.basename(self._make_directory_in_testhome())
+        dir_name = os.path.basename(self._make_directory_in_home())
         first_dir = self._get_file_by_name(dir_name)
 
         self._do_action_on_file(first_dir, 'Delete')
@@ -319,7 +341,7 @@
         self._assert_number_of_files(1)
 
     def test_delete_directory(self):
-        dir_name = os.path.basename(self._make_directory_in_testhome())
+        dir_name = os.path.basename(self._make_directory_in_home())
         first_dir = self._get_file_by_name(dir_name)
 
         self._do_action_on_file(first_dir, 'Delete')
@@ -328,7 +350,7 @@
         self._assert_number_of_files(0)
 
     def test_cancel_delete_file(self):
-        file_name = os.path.basename(self._make_file_in_testhome())
+        file_name = os.path.basename(self._make_file_in_home())
         first_file = self._get_file_by_name(file_name)
 
         self._do_action_on_file(first_file, 'Delete')
@@ -337,7 +359,7 @@
         self._assert_number_of_files(1)
 
     def test_delete_file(self):
-        file_name = os.path.basename(self._make_file_in_testhome())
+        file_name = os.path.basename(self._make_file_in_home())
         first_file = self._get_file_by_name(file_name)
 
         self._do_action_on_file(first_file, 'Delete')
@@ -348,13 +370,14 @@
     def test_create_directory(self):
         dir_name = 'Test Directory'
         self.addCleanup(self._rmdir_cleanup,
-                        os.path.join(os.environ['TESTHOME'], dir_name))
+                        os.path.join(self.home_dir, dir_name))
 
-        toolbar = self.main_view.open_toolbar()
-        toolbar.click_button('actions')
+        open_popover = lambda: \
+            self.main_view.open_toolbar().click_button('actions')
+        self._safe_open_popover(open_popover)
 
         folder_actions_popover = self.main_view.get_folder_actions_popover()
-        folder_actions_popover.click_button('Create New Folder')
+        folder_actions_popover.click_button_by_text('Create New Folder')
         self._confirm_dialog(dir_name)
 
         self._assert_number_of_files(1)
@@ -363,17 +386,18 @@
         self.assertThat(dir_.fileName, Eventually(Equals(dir_name)))
 
     def test_cancel_create_directory(self):
-        toolbar = self.main_view.open_toolbar()
-        toolbar.click_button('actions')
+        open_popover = lambda: \
+            self.main_view.open_toolbar().click_button('actions')
+        self._safe_open_popover(open_popover)
 
         folder_actions_popover = self.main_view.get_folder_actions_popover()
-        folder_actions_popover.click_button('Create New Folder')
+        folder_actions_popover.click_button_by_text('Create New Folder')
         self._cancel_confirm_dialog()
 
         self._assert_number_of_files(0)
 
     def test_show_directory_properties_from_list(self):
-        dir_path = self._make_directory_in_testhome()
+        dir_path = self._make_directory_in_home()
         dir_name = os.path.basename(dir_path)
         first_dir = self._get_file_by_name(dir_name)
 
@@ -387,7 +411,7 @@
         # --elopio - 2013-07-25
 
     def test_show_file_properties(self):
-        file_path = self._make_file_in_testhome()
+        file_path = self._make_file_in_home()
         file_name = os.path.basename(file_path)
         first_file = self._get_file_by_name(file_name)
 
@@ -400,12 +424,12 @@
 
     def test_copy_directory(self):
         # Set up a directory to copy and a directory to copy it into.
-        destination_dir_path = os.path.join(os.environ['TESTHOME'],
+        destination_dir_path = os.path.join(self.home_dir,
                                             'destination')
         destination_dir_name = os.path.basename(destination_dir_path)
         os.mkdir(destination_dir_path)
         self.addCleanup(self._rmdir_cleanup, destination_dir_path)
-        dir_to_copy_path = os.path.join(os.environ['TESTHOME'], 'to_copy')
+        dir_to_copy_path = os.path.join(self.home_dir, 'to_copy')
         dir_to_copy_name = os.path.basename(dir_to_copy_path)
         os.mkdir(dir_to_copy_path)
         self.addCleanup(self._rmdir_cleanup, dir_to_copy_path)
@@ -423,11 +447,12 @@
         self._open_directory(destination_dir)
 
         # Paste the directory.
-        toolbar = self.main_view.open_toolbar()
-        toolbar.click_button('actions')
+        open_popover = lambda: \
+            self.main_view.open_toolbar().click_button('actions')
+        self._safe_open_popover(open_popover)
 
         folder_actions_popover = self.main_view.get_folder_actions_popover()
-        folder_actions_popover.click_button('Paste 1 File')
+        folder_actions_popover.click_button_by_text('Paste 1 File')
         self.assertThat(
             self.main_view.folder_actions_popover_exists,
             Eventually(Equals(False)))
@@ -447,12 +472,12 @@
 
     def test_cut_directory(self):
         # Set up a directory to cut and a directory to move it into.
-        destination_dir_path = os.path.join(os.environ['TESTHOME'],
+        destination_dir_path = os.path.join(self.home_dir,
                                             'destination')
         destination_dir_name = os.path.basename(destination_dir_path)
         os.mkdir(destination_dir_path)
         self.addCleanup(self._rmdir_cleanup, destination_dir_path)
-        dir_to_cut_path = os.path.join(os.environ['TESTHOME'], 'to_cut')
+        dir_to_cut_path = os.path.join(self.home_dir, 'to_cut')
         dir_to_cut_name = os.path.basename(dir_to_cut_path)
         os.mkdir(dir_to_cut_path)
         self.addCleanup(self._rmdir_cleanup, dir_to_cut_path)
@@ -470,11 +495,12 @@
         self._open_directory(destination_dir)
 
         # Paste the directory.
-        toolbar = self.main_view.open_toolbar()
-        toolbar.click_button('actions')
+        open_popover = lambda: \
+            self.main_view.open_toolbar().click_button('actions')
+        self._safe_open_popover(open_popover)
 
         folder_actions_popover = self.main_view.get_folder_actions_popover()
-        folder_actions_popover.click_button('Paste 1 File')
+        folder_actions_popover.click_button_by_text('Paste 1 File')
         self.assertThat(
             self.main_view.folder_actions_popover_exists,
             Eventually(Equals(False)))
@@ -495,12 +521,11 @@
         self.assertThat(
             first_dir.fileName, Eventually(Equals(destination_dir_name)))
 
-    @unittest.skip("Fails in lab due to lab issues not present on phone")
     def test_copy_file(self):
         # Set up a file to copy and a directory to copy it into.
-        destination_dir_path = self._make_directory_in_testhome()
+        destination_dir_path = self._make_directory_in_home()
         destination_dir_name = os.path.basename(destination_dir_path)
-        file_to_copy_path = self._make_file_in_testhome()
+        file_to_copy_path = self._make_file_in_home()
         file_to_copy_name = os.path.basename(file_to_copy_path)
 
         folder_list_page = self.main_view.get_folder_list_page()
@@ -516,11 +541,12 @@
         self._open_directory(destination_dir)
 
         # Paste the file.
-        toolbar = self.main_view.open_toolbar()
-        toolbar.click_button('actions')
+        open_popover = lambda: \
+            self.main_view.open_toolbar().click_button('actions')
+        self._safe_open_popover(open_popover)
 
         folder_actions_popover = self.main_view.get_folder_actions_popover()
-        folder_actions_popover.click_button('Paste 1 File')
+        folder_actions_popover.click_button_by_text('Paste 1 File')
 
         self.assertThat(
             self.main_view.folder_actions_popover_exists,
@@ -542,12 +568,11 @@
         self.assertThat(
             first_dir.fileName, Eventually(Equals(destination_dir_name)))
 
-    @unittest.skip("Fails in lab due to lab issues not present on phone")
     def test_cut_file(self):
         # Set up a file to cut and a directory to move it into.
-        destination_dir_path = self._make_directory_in_testhome()
+        destination_dir_path = self._make_directory_in_home()
         destination_dir_name = os.path.basename(destination_dir_path)
-        file_to_cut_path = self._make_file_in_testhome()
+        file_to_cut_path = self._make_file_in_home()
         file_to_cut_name = os.path.basename(file_to_cut_path)
 
         folder_list_page = self.main_view.get_folder_list_page()
@@ -563,11 +588,12 @@
         self._open_directory(destination_dir)
 
         # Paste the file.
-        toolbar = self.main_view.open_toolbar()
-        toolbar.click_button('actions')
+        open_popover = lambda: \
+            self.main_view.open_toolbar().click_button('actions')
+        self._safe_open_popover(open_popover)
 
         folder_actions_popover = self.main_view.get_folder_actions_popover()
-        folder_actions_popover.click_button('Paste 1 File')
+        folder_actions_popover.click_button_by_text('Paste 1 File')
         self.assertThat(
             self.main_view.folder_actions_popover_exists,
             Eventually(Equals(False)))
@@ -589,7 +615,7 @@
             first_dir.fileName, Eventually(Equals(destination_dir_name)))
 
     def test_go_up(self):
-        dir_name = os.path.basename(self._make_directory_in_testhome())
+        dir_name = os.path.basename(self._make_directory_in_home())
         first_dir = self._get_file_by_name(dir_name)
         self._open_directory(first_dir)
 
@@ -599,7 +625,7 @@
         folder_list_page = self.main_view.get_folder_list_page()
         self.assertThat(
             folder_list_page.get_current_path,
-            Eventually(Equals(os.environ['TESTHOME'])))
+            Eventually(Equals(self.home_dir)))
 
     def test_go_home(self):
         self._go_to_place('Home')
@@ -607,7 +633,7 @@
         folder_list_page = self.main_view.get_folder_list_page()
         self.assertThat(
             folder_list_page.get_current_path,
-            Eventually(Equals(os.environ['HOME'])))
+            Eventually(Equals(self.home_dir)))
 
     def test_go_to_root(self):
         self._go_to_place('File System')
@@ -619,10 +645,10 @@
 
     def test_file_context_menu_shows(self):
         """Checks to make sure that the file actions popover is shown."""
-        file_name = os.path.basename(self._make_file_in_testhome())
+        file_name = os.path.basename(self._make_file_in_home())
 
         first_file = self._get_file_by_name(file_name)
-        first_file.open_actions_popover()
+        self._safe_open_popover(first_file.open_actions_popover)
 
         file_actions_popover = self.main_view.get_file_actions_popover()
         self.assertThat(