Merge lp:~nskaggs/ubuntu-calendar-app/fix-db-path into lp:ubuntu-calendar-app

[Nicholas Skaggs]

update the hardcoded db path so autopilot tests can continue to work

Fix https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1234544, update the hardcoded db path so autopilot tests can continue to work

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

PASSED: Continuous integration, rev:132
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/107/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/629
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/107
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/107
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/107
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/107

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

review: Approve (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-calendar-app-autolanding/37/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/670
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-autolanding/37
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-autolanding/39
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/37
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/37

review: Needs Fixing (continuous-integration)

[Loïc Minier (lool)]

Could you get the name from Qt/SDK instead of harcoding it? Otherwise we have to ensure the test and the updated SDK land at exactly the same time, and if the location changes again, it will break again.

[Nicholas Skaggs (nskaggs)]

Loïc, long term the plan is to push this as a property into the uitk emulator, along with much of the other stuff in the __init__.py file (hopefully!).

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/calendar_app/tests/__init__.py'
--- tests/autopilot/calendar_app/tests/__init__.py	2013-10-01 17:38:51 +0000
+++ tests/autopilot/calendar_app/tests/__init__.py	2013-10-03 17:28:41 +0000
@@ -45,8 +45,7 @@
 
     local_location = "../../calendar.qml"
     installed_location = "/usr/share/calendar-app/calendar.qml"
-    sqlite_dir = os.path.expanduser(
-        "~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/Databases")
+    sqlite_dir = os.path.expanduser("~/.local/share/calendar-app/Databases")
     backup_dir = sqlite_dir + ".backup"
 
     def setUp(self):