Merge lp://qastaging/~charlesk/indicator-power/use-dbusmock-notify-template into lp://qastaging/indicator-power
| Status: | Approved |
|---|---|
| Approved by: | Antti Kaijanmäki |
| Approved revision: | 299 |
| Proposed branch: | lp://qastaging/~charlesk/indicator-power/use-dbusmock-notify-template |
| Merge into: | lp://qastaging/indicator-power |
| Diff against target: |
620 lines (+219/-217) 5 files modified
debian/control (+0/-2) tests/CMakeLists.txt (+0/-5) tests/glib-fixture.h (+11/-11) tests/test-dbus-fixture.h (+108/-0) tests/test-notify.cc (+100/-199) |
| To merge this branch: | bzr merge lp://qastaging/~charlesk/indicator-power/use-dbusmock-notify-template |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Antti Kaijanmäki (community) | Approve | ||
| PS Jenkins bot | continuous-integration | Pending | |
|
Review via email:
|
|||
Commit message
In tests, use python-dbusmock's notification_daemon mock
Description of the change
No changes to production -- only to test scaffolding.
Use python-dbusmock's notification_daemon mock instead of rolling our own.
Unmerged revisions
- 300. By Charles Kerr
-
sync tests/CMakeList
s.txt dependencies with debian/control - 299. By Charles Kerr
-
remove the dbusmock startup script and instead invoke dbusmock ourselves
- 298. By Charles Kerr
-
reuse test-dbus-fixture.h from indicator-
datetime/ 16.10 - 297. By Charles Kerr
-
sync with trunk/16.10
- 296. By Charles Kerr
-
in tests/test-notify, use dbusmock's notification_daemon template instead of rolling our own
- 295. By Charles Kerr
-
in tests/CMakeList
s.txt, add SCRIPTS_DIR definition to so tests will know where to find start-mock- notifications. py - 294. By Charles Kerr
-
add tests/start-
mock-notificati ons.py, a simple dbusmock helper script that can be told to emulate unity7 or unity8 notification server capabilities - 293. By Charles Kerr
-
add tests/dbus-
fixture. h, a fixture that manages a dbus connection and has helper utils - 292. By Charles Kerr
-
in tests/glib-
fixture. h, rename the protected loop variable as 'm_loop' for naming consistency - 291. By Charles Kerr
-
remove libdbustest, we're calling dbusmock directly so we can use templates with parameters
LGTM.