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

[Nicholas Skaggs]

Finish fixing bug 1367453

Finish fixing bug 1367453

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

FAILED: Continuous integration, rev:293
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/341/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/630/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/139/console

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

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-filemanager-app/fix-1367453]

294. By Nicholas Skaggs on 2014-09-30

flake8 love

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

PASSED: Continuous integration, rev:294
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/342/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/633
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/633/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/140

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/filemanager/tests/__init__.py'
--- tests/autopilot/filemanager/tests/__init__.py	2014-09-22 22:52:54 +0000
+++ tests/autopilot/filemanager/tests/__init__.py	2014-09-30 22:38:46 +0000
@@ -29,6 +29,7 @@
 from autopilot.testcase import AutopilotTestCase
 from testtools.matchers import Equals
 import ubuntuuitoolkit
+from ubuntuuitoolkit import fixture_setup as toolkit_fixtures
 
 import filemanager
 from filemanager import fixture_setup as fm_fixtures
@@ -197,19 +198,113 @@
     def _patch_home(self):
         """ mock /home for testing purposes to preserve user data
         """
-        temp_dir_fixture = fixtures.TempDir()
+
+        original_home = os.environ.get('HOME')
+        original_app_launch = os.environ.get('UBUNTU_APP_LAUNCH_LINK_FARM')
+        original_xdg_config_home = os.environ.get('XDG_CONFIG_HOME')
+
+        # click requires apparmor profile, and writing to special dir
+        # but the desktop can write to a traditional /tmp directory
+        if self.test_type == 'click':
+            env_dir = os.path.join(os.environ.get('HOME'), 'autopilot',
+                                   'fakeenv')
+
+            if not os.path.exists(env_dir):
+                os.makedirs(env_dir)
+
+            temp_dir_fixture = fixtures.TempDir(env_dir)
+        else:
+            temp_dir_fixture = fixtures.TempDir()
+
+        # setup fixture paths
         self.useFixture(temp_dir_fixture)
         temp_dir = temp_dir_fixture.path
         temp_xdg_config_home = os.path.join(temp_dir, '.config')
+        temp_app_launch = os.path.join(temp_dir, '.cache',
+                                       'ubuntu-app-launch', 'desktop')
+
+        # create the needed directores
+        if not os.path.exists(temp_xdg_config_home):
+            os.makedirs(temp_xdg_config_home)
+        if not os.path.exists(temp_app_launch):
+            os.makedirs(temp_app_launch)
+
+        # for click, we need to create additional directories
+        # apparmor doesn't allow the app to create needed directories,
+        # so we create them now
+        if self.test_type == 'click':
+            temp_dir_cache = os.path.join(temp_dir, '.cache')
+            temp_dir_cache_font = os.path.join(temp_dir_cache, 'fontconfig')
+            temp_dir_cache_media = os.path.join(temp_dir_cache, 'media-art')
+            temp_dir_cache_write = os.path.join(temp_dir_cache,
+                                                'tncache-write-text.null')
+            temp_dir_config = os.path.join(temp_dir, '.config')
+            temp_dir_toolkit = os.path.join(temp_dir_config,
+                                            'ubuntu-ui-toolkit')
+            temp_dir_font = os.path.join(temp_dir_cache, '.fontconfig')
+            temp_dir_local = os.path.join(temp_dir, '.local', 'share')
+            temp_dir_confined = os.path.join(temp_dir, 'confined')
+
+            if not os.path.exists(temp_dir_cache):
+                os.makedirs(temp_dir_cache)
+            if not os.path.exists(temp_dir_cache_font):
+                os.makedirs(temp_dir_cache_font)
+            if not os.path.exists(temp_dir_cache_media):
+                os.makedirs(temp_dir_cache_media)
+            if not os.path.exists(temp_dir_cache_write):
+                os.makedirs(temp_dir_cache_write)
+            if not os.path.exists(temp_dir_config):
+                os.makedirs(temp_dir_config)
+            if not os.path.exists(temp_dir_toolkit):
+                os.makedirs(temp_dir_toolkit)
+            if not os.path.exists(temp_dir_font):
+                os.makedirs(temp_dir_font)
+            if not os.path.exists(temp_dir_local):
+                os.makedirs(temp_dir_local)
+            if not os.path.exists(temp_dir_confined):
+                os.makedirs(temp_dir_confined)
 
         # before we set fixture, copy xauthority if needed
         self._copy_xauthority_file(temp_dir)
 
-        self.useFixture(
-            fixtures.EnvironmentVariable('HOME', newvalue=temp_dir))
-        self.useFixture(
-            fixtures.EnvironmentVariable(
-                'XDG_CONFIG_HOME',  newvalue=temp_xdg_config_home))
+        # set the fixture
+        # for click, use initctl, otherwise set env directly
+        if self.test_type == 'click':
+            self.useFixture(toolkit_fixtures.InitctlEnvironmentVariable(
+                            HOME=temp_dir))
+            self.useFixture(toolkit_fixtures.InitctlEnvironmentVariable(
+                            XDG_CONFIG_HOME=temp_xdg_config_home))
+            self.useFixture(toolkit_fixtures.InitctlEnvironmentVariable(
+                            UBUNTU_APP_LAUNCH_LINK_FARM=temp_app_launch))
+
+        else:
+            self.useFixture(fixtures.EnvironmentVariable('HOME',
+                                                         newvalue=temp_dir))
+            self.useFixture(fixtures.EnvironmentVariable(
+                'XDG_CONFIG_HOME', newvalue=temp_xdg_config_home))
+            self.useFixture(fixtures.EnvironmentVariable(
+                'UBUNTU_APP_LAUNCH_LINK_FARM', newvalue=temp_app_launch))
+
+        # For now, blow away actual env vars and restore
+        # TODO: Remove code once pad.lv/1370800 is fixed
+        def undo_patch(key, value):
+            logging.info(
+                "Resetting environment variable '%s' to '%s'",
+                key,
+                value
+            )
+
+            os.environ[key] = value
+
+        os.environ['HOME'] = temp_dir
+        os.environ['XDG_CONFIG_HOME'] = temp_xdg_config_home
+        os.environ['UBUNTU_APP_LAUNCH_LINK_FARM'] = temp_app_launch
+
+        self.addCleanup(undo_patch, 'HOME', original_home)
+        self.addCleanup(undo_patch, 'UBUNTU_APP_LAUNCH_LINK_FARM',
+                        original_app_launch or '')
+        self.addCleanup(undo_patch, 'XDG_CONFIG_HOME',
+                        original_xdg_config_home or '')
 
         logger.debug("Patched home to fake home directory %s" % temp_dir)
         return temp_dir