Merge lp://qastaging/~ken-vandine/content-hub/trust_session_wip into lp://qastaging/content-hub
- trust_session_wip
- Merge into trunk
Status: | Merged |
---|---|
Merged at revision: | 314 |
Proposed branch: | lp://qastaging/~ken-vandine/content-hub/trust_session_wip |
Merge into: | lp://qastaging/content-hub |
Diff against target: |
1425 lines (+1032/-9) 25 files modified
CMakeLists.txt (+4/-2) debian/content-hub.install (+1/-0) debian/control (+2/-0) import/Ubuntu/Content/contenthub.h (+1/-0) include/com/ubuntu/content/transfer.h (+4/-0) src/CMakeLists.txt (+2/-1) src/com/ubuntu/applicationmanager/application_manager.h (+14/-0) src/com/ubuntu/content/CMakeLists.txt (+3/-0) src/com/ubuntu/content/detail/app_manager.cpp (+29/-1) src/com/ubuntu/content/detail/app_manager.h (+2/-0) src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml (+4/-0) src/com/ubuntu/content/detail/com.ubuntu.content.Transfer.xml (+9/-0) src/com/ubuntu/content/detail/mir-helper.cpp (+235/-0) src/com/ubuntu/content/detail/mir-helper.h (+69/-0) src/com/ubuntu/content/detail/service.cpp (+54/-4) src/com/ubuntu/content/detail/service.h (+5/-1) src/com/ubuntu/content/detail/transfer.cpp (+38/-0) src/com/ubuntu/content/detail/transfer.h (+7/-0) src/com/ubuntu/content/transfer.cpp (+10/-0) src/com/ubuntu/content/transfer_p.h (+19/-0) src/helper/CMakeLists.txt (+61/-0) src/helper/exec-tool.c (+222/-0) src/helper/exec-tool.cpp (+107/-0) src/helper/mir-connection-demangler.c (+126/-0) tests/acceptance-tests/app_manager_mock.h (+4/-0) |
To merge this branch: | bzr merge lp://qastaging/~ken-vandine/content-hub/trust_session_wip |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
system-apps-ci-bot | continuous-integration | Needs Fixing | |
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+250843@code.qastaging.launchpad.net |
Commit message
Description of the change
Just to get a CI run
PS Jenkins bot (ps-jenkins) wrote : | # |
- 188. By Ken VanDine
-
Moved the session creation to the service
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:188
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
- 189. By Ken VanDine
-
Fixed getting proper clientPid
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:189
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
- 190. By Ken VanDine
-
fixed a crash on systems without Mir
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:190
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 191. By Ken VanDine
-
Re-implemetation of the exec-tool based on the one from pay-service
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:191
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
- 192. By Ken VanDine
-
use mir-connection-
demangler
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:192
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
- 193. By Ken VanDine
-
fixed CONTENT_
HUB_MIR_ SOCKET env
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:193
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 194. By Ken VanDine
-
pass just the fd id
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:194
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 195. By Ken VanDine
-
fixed dbus call to service
- 196. By Ken VanDine
-
ensure the id for the socket is returned as a string
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:196
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 197. By Ken VanDine
-
Fixed reference
- 198. By Ken VanDine
-
MirHelper fixes
- 199. By Ken VanDine
-
more debug output
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:199
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 200. By Ken VanDine
-
more debug output
- 201. By Ken VanDine
-
Hold a reference to the promptSession with the Transfer
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:200
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:201
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 202. By Ken VanDine
-
Removed un-needed unref
- 203. By Ken VanDine
-
ensure the promptSession is destroyed in the Transfer destructor
- 204. By Ken VanDine
-
Delete reference to promptSession in the destructor
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:204
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
- 205. By Ken VanDine
-
fixed ref
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:205
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 206. By Ken VanDine
-
Debugging output
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:206
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 207. By Ken VanDine
-
fixed shell quoting
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:207
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 208. By Ken VanDine
-
working, mostly
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:208
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 209. By Ken VanDine
-
use ubuntu_
app_launch_ stop_helper to stop apps started with a PromptSession
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:209
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:209
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:187 /code.launchpad .net/~ken- vandine/ content- hub/trust_ session_ wip/+merge/ 250843/ +edit-commit- message
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http:// jenkins. qa.ubuntu. com/job/ content- hub-ci/ 216/ jenkins. qa.ubuntu. com/job/ content- hub-vivid- amd64-ci/ 12 jenkins. qa.ubuntu. com/job/ content- hub-vivid- armhf-ci/ 12 jenkins. qa.ubuntu. com/job/ content- hub-vivid- armhf-ci/ 12/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ content- hub-vivid- i386-ci/ 12
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/content- hub-ci/ 216/rebuild
http://