notes-app

Merge lp:~fginther/notes-app/fix-db-path into lp:notes-app

  1. fix-db-path
  2. Merge into trunk
Proposed by Francis Ginther
Status: Merged
Approved by: Loïc Minier
Approved revision: 199
Merged at revision: 198
Proposed branch: lp:~fginther/notes-app/fix-db-path
Merge into: lp:notes-app
Diff against target: 28 lines (+13/-4)
1 file modified
tests/autopilot/notes_app/tests/__init__.py (+13/-4)
To merge this branch: bzr merge lp:~fginther/notes-app/fix-db-path
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Loïc Minier Approve
Review via email: mp+189492@code.launchpad.net

This proposal supersedes a proposal from 2013-10-03.

Commit message

Provide alternate location of offline storage in response to sdk change.

Description of the change

Provide alternate location of offline storage in response to sdk change (see lp:1231863).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:197
http://jenkins.qa.ubuntu.com/job/notes-app-ci/173/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4483
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/71
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/71/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-ci/68
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/358
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/358/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2257
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2257/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1926
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1942

Click here to trigger a rebuild:
http://s-jenkins:8080/job/notes-app-ci/173/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:197
http://jenkins.qa.ubuntu.com/job/notes-app-ci/174/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4487
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2260/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/72/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-ci/69
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/769
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/362
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/362/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2262
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2262/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1933/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1949

Click here to trigger a rebuild:
http://s-jenkins:8080/job/notes-app-ci/174/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Loïc Minier (lool) wrote : Posted in a previous version of this proposal

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.

Revision history for this message
Francis Ginther (fginther) wrote :

New version attempts to use the new path first. Yes it could do better and actually look for the db file, not just check the path.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:198
http://10.97.0.26:8080/job/notes-app-ci/179/
Executed test runs:
    UNSTABLE: http://10.97.0.26:8080/job/generic-mediumtests-saucy/4667
    UNSTABLE: http://10.97.0.26:8080/job/generic-mediumtests-touch/2471
    SUCCESS: http://10.97.0.26:8080/job/notes-app-saucy-amd64-ci/74
    SUCCESS: http://10.97.0.26:8080/job/notes-app-saucy-armhf-ci/77
        deb: http://10.97.0.26:8080/job/notes-app-saucy-armhf-ci/77/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/notes-app-saucy-i386-ci/74
    UNSTABLE: http://10.97.0.26:8080/job/autopilot-testrunner-otto-saucy/855
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-amd64/542
        deb: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-amd64/542/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2473
        deb: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2473/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://10.97.0.26:8080/job/generic-mediumtests-runner-maguro/2031
    UNSTABLE: http://10.97.0.26:8080/job/generic-mediumtests-runner-mako/2044

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notes-app-ci/179/rebuild

review: Needs Fixing (continuous-integration)
lp:~fginther/notes-app/fix-db-path updated
199. By Francis Ginther

Need to return the os.path.expanduser path.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:199
http://10.97.0.26:8080/job/notes-app-ci/180/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-saucy/4668
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-touch/2472
    SUCCESS: http://10.97.0.26:8080/job/notes-app-saucy-amd64-ci/75
    SUCCESS: http://10.97.0.26:8080/job/notes-app-saucy-armhf-ci/78
        deb: http://10.97.0.26:8080/job/notes-app-saucy-armhf-ci/78/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/notes-app-saucy-i386-ci/75
    SUCCESS: http://10.97.0.26:8080/job/autopilot-testrunner-otto-saucy/856
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-amd64/543
        deb: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-amd64/543/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2474
        deb: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2474/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-runner-maguro/2032
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-runner-mako/2045

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notes-app-ci/180/rebuild

review: Approve (continuous-integration)
Revision history for this message
Loïc Minier (lool) wrote :

Looks good, thanks for trying the two pathnames.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/notes_app/tests/__init__.py'
2--- tests/autopilot/notes_app/tests/__init__.py 2013-09-30 22:20:59 +0000
3+++ tests/autopilot/notes_app/tests/__init__.py 2013-10-06 04:34:02 +0000
4@@ -183,11 +183,20 @@
5 Helper functions for dealing with sqlite databases
6 """
7
8+ def _get_db_path(self):
9+ db_path_list = [
10+ "~/.local/share/notes-app/Databases",
11+ "~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/"
12+ "Databases/"]
13+ for path in db_path_list:
14+ path = os.path.expanduser(path)
15+ if os.path.exists(path):
16+ return path
17+ return None
18+
19 def find_db(self):
20- dbs_path = os.path.expanduser(
21- "~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/"
22- "Databases/")
23- if not os.path.exists(dbs_path):
24+ dbs_path = self._get_db_path()
25+ if not dbs_path:
26 return None
27 files = [f for f in os.listdir(dbs_path)
28 if os.path.splitext(f)[1] == ".ini"]

Subscribers

People subscribed via source and target branches