Merge lp://staging/~ted/dbus-test-runner/dbusmock-system-bus into lp://staging/dbus-test-runner/15.04

Proposed by Ted Gould
Status: Merged
Approved by: Ted Gould
Approved revision: 95
Merged at revision: 90
Proposed branch: lp://staging/~ted/dbus-test-runner/dbusmock-system-bus
Merge into: lp://staging/dbus-test-runner/15.04
Diff against target: 339 lines (+143/-33)
6 files modified
debian/libdbustest1.symbols (+1/-0)
libdbustest/dbus-mock.c (+40/-25)
libdbustest/task.c (+17/-2)
libdbustest/task.h (+1/-0)
tests/Makefile.am (+6/-0)
tests/test-libdbustest-mock.c (+78/-6)
To merge this branch: bzr merge lp://staging/~ted/dbus-test-runner/dbusmock-system-bus
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+248072@code.staging.launchpad.net

Commit message

Make watching the task use the same bus the task is on

Description of the change

While we added the ability for tasks to show up on other busses, we didn't update the watchers of those tasks to be aware of them being on other busses and so therefore the watchers were left behind and lonely. Nobody wants lonely watchers. Participate! Set down that video camera!

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
94. By Ted Gould

Add a test that tests waiting on system services

95. By Ted Gould

Check running the mock on the system bus

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

LGTM

review: Approve
96. By Ted Gould

This seems to fail on PPC occationally, curious if it's the fact that we're using the parameter which could be optimized oddly on different platforms. Going for a global.

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