Merge lp:~nskaggs/ubuntu-calendar-app/fix-ap-jenkins-runs into lp:ubuntu-calendar-app

[Nicholas Skaggs]

Fix application launching as a stopgap solution to jenkins test failures until bug 1376423 is fixed.

Fix application launching as a stopgap solution to jenkins test failures until bug 1376423 is fixed.

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

PASSED: Continuous integration, rev:539
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1016/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/70
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/70/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/13

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me !!
Thanks a lot Nicholas :D

review: Approve

=== modified file 'tests/autopilot/calendar_app/tests/__init__.py'
--- tests/autopilot/calendar_app/tests/__init__.py	2014-09-30 00:38:14 +0000
+++ tests/autopilot/calendar_app/tests/__init__.py	2014-11-07 21:02:05 +0000
@@ -28,10 +28,7 @@
 from autopilot import logging as autopilot_logging
 
 import ubuntuuitoolkit
-from ubuntuuitoolkit import (
-    base,
-    fixture_setup as toolkit_fixtures
-)
+from ubuntuuitoolkit import base
 
 logger = logging.getLogger(__name__)
 
@@ -62,7 +59,7 @@
     def setUp(self):
         super(BaseTestCaseWithPatchedHome, self).setUp()
         self.launcher, self.test_type = self.get_launcher_and_type()
-        self.home_dir = self._patch_home()
+        self.home_dir = self.patch_home()
 
     @autopilot_logging.log_action(logger.info)
     def launch_test_local(self):
@@ -103,59 +100,17 @@
                                    '.Xauthority')),
                 os.path.join(directory, '.Xauthority'))
 
-    def _patch_home(self):
+    def patch_home(self):
         """ mock /home for testing purposes to preserve user data
         """
-        # 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)
-            self.useFixture(temp_dir_fixture)
-
-            # apparmor doesn't allow the app to create needed directories,
-            # so we create them now
-            temp_dir = temp_dir_fixture.path
-            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(toolkit_fixtures.InitctlEnvironmentVariable(
-                            HOME=temp_dir))
+
+        # if running on non-phablet device,
+        # run in temp folder to avoid mucking up home
+        # bug 1316746
+        # bug 1376423
+        if self.test_type is 'click':
+            # just use home for now on devices
+            temp_dir = os.environ.get('HOME')
         else:
             temp_dir_fixture = fixtures.TempDir()
             self.useFixture(temp_dir_fixture)
@@ -166,9 +121,34 @@
             self.useFixture(fixtures.EnvironmentVariable('HOME',
                                                          newvalue=temp_dir))
 
-        logger.debug("Patched home to fake home directory %s" % temp_dir)
+            logger.debug("Patched home to fake home directory %s" % temp_dir)
+            self.setup_evolution()
         return temp_dir
 
+    def setup_evolution(self):
+        """restart evolution under our fake home fixture
+           so there are no pre-existing events """
+
+        if self.test_type is 'click':
+            # do nothing for now on click
+            return
+        else:
+            # from lp:qtorganizer5-eds
+            # upstream patches XDG folders and other env vars
+            # seems it's enough to kill the evolution daemons
+            # they will restart when needed (during app launch)
+            # to clean up we will again kill them
+            # to restore proper function to host system
+
+            os.system('/usr/lib/evolution/evolution-calendar-factory &')
+            os.system('/usr/lib/evolution/evolution-source-registry &')
+
+            self.addCleanup(os.system,
+                            '/usr/lib/evolution/evolution-calendar-factory &')
+            self.addCleanup(os.system,
+                            '/usr/lib/evolution/evolution-source-registry &')
+            logger.debug("Restarted evolution daemons")
+
 
 class CalendarAppTestCase(BaseTestCaseWithPatchedHome):
 
@@ -181,6 +161,8 @@
 
 class CalendarAppTestCaseWithVcard(BaseTestCaseWithPatchedHome):
 
+    """Launch the calendar-app with vcard for contact support"""
+
     def setup_vcard(self):
         if self.test_type is 'deb':
             location = '/usr/lib/python3/dist-packages/calendar_app'