Merge lp://qastaging/~ken-vandine/content-hub/trust_session_wip into lp://qastaging/content-hub

Proposed by Ken VanDine
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
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

Description of the change

Just to get a CI run

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

FAILED: Continuous integration, rev:187
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/216/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/216/rebuild

review: Needs Fixing (continuous-integration)
188. By Ken VanDine

Moved the session creation to the service

Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/217/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/13/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/217/rebuild

review: Needs Fixing (continuous-integration)
189. By Ken VanDine

Fixed getting proper clientPid

Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/218/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/14/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/218/rebuild

review: Needs Fixing (continuous-integration)
190. By Ken VanDine

fixed a crash on systems without Mir

Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/219/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/219/rebuild

review: Needs Fixing (continuous-integration)
191. By Ken VanDine

Re-implemetation of the exec-tool based on the one from pay-service

Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/220/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/16/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/220/rebuild

review: Needs Fixing (continuous-integration)
192. By Ken VanDine

use mir-connection-demangler

Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/221/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/17/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/221/rebuild

review: Needs Fixing (continuous-integration)
193. By Ken VanDine

fixed CONTENT_HUB_MIR_SOCKET env

Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/222/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/222/rebuild

review: Needs Fixing (continuous-integration)
194. By Ken VanDine

pass just the fd id

Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/223/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/19/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/19

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/223/rebuild

review: Needs Fixing (continuous-integration)
195. By Ken VanDine

fixed dbus call to service

196. By Ken VanDine

ensure the id for the socket is returned as a string

Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/224/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/224/rebuild

review: Needs Fixing (continuous-integration)
197. By Ken VanDine

Fixed reference

198. By Ken VanDine

MirHelper fixes

199. By Ken VanDine

more debug output

Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/225/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/225/rebuild

review: Needs Fixing (continuous-integration)
200. By Ken VanDine

more debug output

201. By Ken VanDine

Hold a reference to the promptSession with the Transfer

Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/226/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/226/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/227/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/227/rebuild

review: Needs Fixing (continuous-integration)
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

Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/228/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/24/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/228/rebuild

review: Needs Fixing (continuous-integration)
205. By Ken VanDine

fixed ref

Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/229/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/25/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/25

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/229/rebuild

review: Needs Fixing (continuous-integration)
206. By Ken VanDine

Debugging output

Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/230/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/26/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/26

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/230/rebuild

review: Needs Fixing (continuous-integration)
207. By Ken VanDine

fixed shell quoting

Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/234/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/30

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/234/rebuild

review: Needs Fixing (continuous-integration)
208. By Ken VanDine

working, mostly

Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/235/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/31

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/235/rebuild

review: Needs Fixing (continuous-integration)
209. By Ken VanDine

use ubuntu_app_launch_stop_helper to stop apps started with a PromptSession

Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/243/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/39

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/243/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
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://code.launchpad.net/~ken-vandine/content-hub/trust_session_wip/+merge/250843/+edit-commit-message

https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/4/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/565/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/565/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/4/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches