Merge lp://qastaging/~kalikiana/u1db-qt/syncWithU1 into lp://qastaging/u1db-qt
| Status: | Work in progress | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~kalikiana/u1db-qt/syncWithU1 | ||||||||||||
| Merge into: | lp://qastaging/u1db-qt | ||||||||||||
| Diff against target: |
1664 lines (+934/-295) 13 files modified
debian/control (+2/-0) examples/notes-cloud/notes-cloud.qml (+267/-148) modules/U1db/plugin.cpp (+2/-0) src/CMakeLists.txt (+5/-1) src/database.cpp (+10/-0) src/database.h (+1/-1) src/request.cpp (+87/-0) src/request.h (+77/-0) src/server.cpp (+94/-0) src/server.h (+67/-0) src/synchronizer.cpp (+204/-137) src/synchronizer.h (+21/-8) tests/tst_sync.qml (+97/-0) |
||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~kalikiana/u1db-qt/syncWithU1 | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| U1DB Qt developers | Pending | ||
|
Review via email:
|
|||
Commit message
Make sync with U1 and authentication possible
Description of the change
This branch incorporates:
- Improvemed error handling. HTTP status codes, U1Db JSON errors and JSON validation all end up in sync_output as errors now.
- Rewritten example including both test and live server, editable notes and credentials test UI.
- New target syntax: "uri" is sufficient to define local and remote targets with IP or hostname and optional port. Notably it's no longer required to know the IP.
- Code unification between Database and Synchronizer for getting the replica_id.
Progress: 100%
- Caveat: New data isn't pushed to the remote, this is bug 1273688.
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
Unmerged revisions
- 127. By Cris Dywan
-
Implement 5 minute timeout in Request
- 126. By Cris Dywan
-
Introduce Server based on Request for sync unit tests
- 125. By Cris Dywan
-
Add unit tests for Synchronizer target syntax
- 124. By Cris Dywan
-
Reset synchronize if URI is invalid
- 123. By Cris Dywan
-
Add message to syncOutput if no targets were specified
- 122. By Cris Dywan
-
Reset synchronize after success/ error or if nothing happened
- 121. By Cris Dywan
-
sync_output should be called syncOutput
- 120. By Cris Dywan
-
Fix synchronize property/ signal/ methods
- 119. By Cris Dywan
-
Merge lp:u1db-qt
- 118. By Cris Dywan
-
Implement networkRequest signal to handle credentials correctly
FAILED: Continuous integration, rev:118
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://