URL Dispatcher

Merge lp:~dobey/url-dispatcher/fix-unity8-dash into lp:url-dispatcher

  1. fix-unity8-dash
  2. Merge into trunk.17.04
Proposed by dobey
Status: Merged
Approved by: Ted Gould
Approved revision: 114
Merged at revision: 118
Proposed branch: lp:~dobey/url-dispatcher/fix-unity8-dash
Merge into: lp:url-dispatcher
Diff against target: 31 lines (+3/-6)
2 files modified
service/dispatcher.c (+1/-1)
tests/dispatcher-test.cc (+2/-5)
To merge this branch: bzr merge lp:~dobey/url-dispatcher/fix-unity8-dash
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
unity-api-1-bot continuous-integration Needs Fixing
Review via email: [email protected]

Commit message

The unity8-dash interface is actually com.canonical.UnityDash.

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/52/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1794/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1801
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1577
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1577/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1577
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1577/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1577
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1577/artifact/output/*zip*/output.zip
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1577/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1577
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1577/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1577
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1577/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/52/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 'service/dispatcher.c'
2--- service/dispatcher.c 2017-03-09 22:21:52 +0000
3+++ service/dispatcher.c 2017-03-16 17:02:21 +0000
4@@ -261,7 +261,7 @@
5 /* If it is from a scope we need to overlay onto the
6 dash instead */
7 if (scope_checker_is_scope_pid(checker, pid)) {
8- pid = _get_pid_from_dbus(conn, "com.canonical.Unity8Dash");
9+ pid = _get_pid_from_dbus(conn, "com.canonical.UnityDash");
10 }
11
12 return overlay_tracker_add(tracker, app_id, pid, url);
13
14=== modified file 'tests/dispatcher-test.cc'
15--- tests/dispatcher-test.cc 2017-03-10 23:52:11 +0000
16+++ tests/dispatcher-test.cc 2017-03-16 17:02:21 +0000
17@@ -308,12 +308,9 @@
18
19 DbusTestDbusMock * setupPidMock()
20 {
21- auto mock = dbus_test_dbus_mock_new("com.canonical.Unity8Dash");
22- auto obj = dbus_test_dbus_mock_get_object(mock,
23- "/", "com.canonical.Unity8Dash",
24- nullptr);
25+ auto mock = dbus_test_dbus_mock_new("com.canonical.UnityDash");
26
27- dbus_test_task_set_name(DBUS_TEST_TASK(mock), "Unity8Dash");
28+ dbus_test_task_set_name(DBUS_TEST_TASK(mock), "UnityDash");
29 dbus_test_task_run(DBUS_TEST_TASK(mock));
30
31 return mock;

Subscribers

People subscribed via source and target branches