Merge lp:~nik90/ubuntu-clock-app/fix-autopilot-environment-cleanup into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Updated autopilot sqlite_dir location in light of the recent transition to u1db for local storage.

The clock app has transitioned to u1db for local storage. This has resulted in the sqlite_dir to be changed from .local/share/com.ubuntu.clock/Databases to .local/share/com.ubuntu.clock/. This MP fixes autopilot to use the new path.

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

PASSED: Continuous integration, rev:331
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/217/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1199
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/217
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/217
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/135

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

review: Approve (continuous-integration)

[Leo Arias (elopio)]

nik90: your branch seems ok to fix the current tests.
but renato is right, it would be better to use a different path for the tests.
if you can modify the database path to a temporary using environment variables, that would be ideal.

review: Approve (code review)

[Nekhelesh Ramananthan (nik90)]

@balloons, do note that after discussing this with elopio on IRC, it was decided that the database path approach (using python fissures) would be implemented next week either by you guys or myself depending on who gets to it first. Until then I would rather not want this MP to be delayed since I have lots of MP coming this week where jenkins autopilot will incorrectly set up the environment causing flaky test.

This is an important prerequisite MP for other MPs.

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
--- tests/autopilot/ubuntu_clock_app/tests/__init__.py	2013-11-04 20:40:16 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py	2014-02-09 17:03:58 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013 Canonical Ltd
+# Copyright (C) 2013, 2014 Canonical Ltd
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -45,7 +45,7 @@
     local_location = "../../ubuntu-clock-app.qml"
     installed_location = "/usr/share/ubuntu-clock-app/ubuntu-clock-app.qml"
     sqlite_dir = os.path.expanduser(
-        "~/.local/share/com.ubuntu.clock/Databases")
+        "~/.local/share/com.ubuntu.clock")
     backup_dir = sqlite_dir + ".backup"
 
     def setUp(self):