Merge lp://qastaging/~charlesk/indicator-sync/lp-1040137 into lp://qastaging/indicator-sync/12.10
Proposed by
Charles Kerr
| Status: | Merged |
|---|---|
| Approved by: | Charles Kerr |
| Approved revision: | 38 |
| Merged at revision: | 11 |
| Proposed branch: | lp://qastaging/~charlesk/indicator-sync/lp-1040137 |
| Merge into: | lp://qastaging/indicator-sync/12.10 |
| Prerequisite: | lp://qastaging/~charlesk/indicator-sync/lp-1041550 |
| Diff against target: |
362 lines (+321/-9) 5 files modified
configure.ac (+1/-0) test/Makefile.am (+40/-9) test/Makefile.am.strings (+38/-0) test/indicator-sync.service.in (+3/-0) test/test-client.cpp (+239/-0) |
| To merge this branch: | bzr merge lp://qastaging/~charlesk/indicator-sync/lp-1040137 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Lars Karlitski (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This isn't a complete set of tests, but as 12.10.1 is coming out today to fix the GIR issues, it would be nice to include them anyway.
If approved, the finished tests would be merged into trunk for 12.10.1, but this branch and bug #1040137 will be left open pending more tests after 12.10.1.
To post a comment you must log in.
Revision history for this message
| Charles Kerr (charlesk) wrote | # |
Revision history for this message
| Charles Kerr (charlesk) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I'm a little worried about the commented code. I recommend keeping that in a branch and only merge the rest into trunk.