URL Dispatcher

Merge lp:~dobey/url-dispatcher/fix-mir-mock into lp:url-dispatcher

  1. fix-mir-mock
  2. Merge into trunk.17.04
Proposed by dobey
Status: Merged
Approved by: Ted Gould
Approved revision: 114
Merged at revision: 117
Proposed branch: lp:~dobey/url-dispatcher/fix-mir-mock
Merge into: lp:url-dispatcher
Diff against target: 12 lines (+1/-1)
1 file modified
tests/mir-mock.cpp (+1/-1)
To merge this branch: bzr merge lp:~dobey/url-dispatcher/fix-mir-mock
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
unity-api-1-bot continuous-integration Needs Fixing
Review via email: mp+320089@code.launchpad.net

Commit message

Fix deprecation warning in mir mock.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:114
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/50/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1792/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1799
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1575
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1575/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1575/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1575
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1575/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1575
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1575/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1575
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1575/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1575
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1575/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/50/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/mir-mock.cpp'
2--- tests/mir-mock.cpp 2015-06-12 15:40:29 +0000
3+++ tests/mir-mock.cpp 2017-03-16 17:01:01 +0000
4@@ -52,7 +52,7 @@
5 }
6
7 MirWaitHandle *
8-mir_prompt_session_new_fds_for_prompt_providers (MirPromptSession * session, unsigned int numfds, mir_client_fd_callback cb, void * data) {
9+mir_prompt_session_new_fds_for_prompt_providers (MirPromptSession * session, unsigned int numfds, MirClientFdCallback cb, void * data) {
10 if (session != mir_mock_valid_trust_session) {
11 std::cerr << "Releasing a Mir Trusted Prompt that isn't valid" << std::endl;
12 exit(1);

Subscribers

People subscribed via source and target branches