Merge lp:~thomir-deactivatedaccount/ubuntu-calendar-app/trunk-fix-ugly-bits into lp:ubuntu-calendar-app

[Charles Kerr]

Fix tmp directory breakage that occurred in unit test's scaffolding under some conditions.

Fix an error in the __init__.py of calendar_app's autopilot tests. '~' was not being expanded by python into a full path when click_test == true, causing tests to fail with:

File "/home/phablet/autopilot/calendar_app/tests/test_weekview.py", line 31, in setUp
super(TestWeekView, self).setUp()
File "/home/phablet/autopilot/calendar_app/tests/__init__.py", line 69, in setUp
self.home_dir = self._patch_home()
File "/home/phablet/autopilot/calendar_app/tests/__init__.py", line 128, in _patch_home
self.useFixture(temp_dir_fixture)
File "/usr/lib/python3/dist-packages/testtools/testcase.py", line 628, in useFixture
fixture.setUp()
File "/usr/lib/python3/dist-packages/fixtures/_fixtures/tempdir.py", line 44, in setUp
self.path = tempfile.mkdtemp(dir=self.rootdir)
File "/usr/lib/python3.4/tempfile.py", line 434, in mkdtemp
_os.mkdir(file, 0o700)
FileNotFoundError: [Errno 2] No such file or directory: '~/autopilot/fakeenv/tmpy3o03xq5'
}}}

[Charles Kerr (charlesk)]

Looks like Nick's done a separate fix at lp:~nskaggs/ubuntu-calendar-app/fix-ap-env-setup so maybe this isn't necessary anymore.

[Nicholas Skaggs (nskaggs)]

Sorry, I was out sick for the week. Thanks for the heads up on this and the suggested tweaks!

We've been iterating on getting test isolation going with apparmor; the other mp incorporates some of what's in here, so I'm going to just reject this.

review: Disapprove

Unmerged revisions

292. By Thomi Richards on 2014-05-27

Fixed bug where '~' was not being expanded, and cleaned up some other code.

=== modified file 'tests/autopilot/calendar_app/tests/__init__.py'
--- tests/autopilot/calendar_app/tests/__init__.py	2014-05-23 08:11:57 +0000
+++ tests/autopilot/calendar_app/tests/__init__.py	2014-05-27 15:06:10 +0000
@@ -48,8 +48,7 @@
     else:
         scenarios = [('with touch', dict(input_device_class=Touch))]
 
-    local_location = os.path.dirname(os.path.dirname(os.getcwd()))
-    local_location_qml = local_location + "/calendar.qml"
+    local_location_qml = os.path.join(os.getcwd(), '..', '..', 'calendar.qml')
     installed_location_qml = "/usr/share/calendar-app/calendar.qml"
 
     def get_launcher_and_type(self):
@@ -120,7 +119,11 @@
         #click requires apparmor profile, and writing to special dir
         #but the desktop can write to a traditional /tmp directory
         if self.test_type == 'click':
-            temp_dir = os.path.join('~', 'autopilot', 'fakeenv')
+            temp_dir = os.path.join(
+                os.path.expanduser('~'),
+                'autopilot',
+                'fakeenv'
+            )
             logger.debug(temp_dir)
             temp_dir_fixture = fixtures.TempDir(temp_dir)
         else: