Merge lp://qastaging/~charlesk/indicator-datetime/lp-1560960-use-dbusmock-timedated-template into lp://qastaging/indicator-datetime/15.10
Proposed by
Charles Kerr
Status: | Merged |
---|---|
Approved by: | Renato Araujo Oliveira Filho |
Approved revision: | 448 |
Merged at revision: | 443 |
Proposed branch: | lp://qastaging/~charlesk/indicator-datetime/lp-1560960-use-dbusmock-timedated-template |
Merge into: | lp://qastaging/indicator-datetime/15.10 |
Prerequisite: | lp://qastaging/~charlesk/indicator-datetime/always-get-initial-tzid-from-timedate1 |
Diff against target: |
847 lines (+212/-394) 6 files modified
include/datetime/dbus-shared.h (+0/-8) src/actions-live.cpp (+5/-4) tests/glib-fixture.h (+16/-13) tests/test-live-actions.cpp (+76/-18) tests/test-timezone-timedated.cpp (+7/-100) tests/timedated-fixture.h (+108/-251) |
To merge this branch: | bzr merge lp://qastaging/~charlesk/indicator-datetime/lp-1560960-use-dbusmock-timedated-template |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Kerr (community) | Approve | ||
Renato Araujo Oliveira Filho (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
Use dbusmock's timedated template in our tests
Description of the change
Minor patch on top of https:/
That branch added a test fixture which uses dbusmock's timedated template. This branch promotes that up to a shared test header where it can be reused by test-live-actions, and removes test-live-actions' previous handrolled timedated mock.
To post a comment you must log in.
PASSED: Continuous integration, rev:448 jenkins. qa.ubuntu. com/job/ indicator- datetime- ci/372/ jenkins. qa.ubuntu. com/job/ indicator- datetime- wily-amd64- ci/62 jenkins. qa.ubuntu. com/job/ indicator- datetime- wily-armhf- ci/62 jenkins. qa.ubuntu. com/job/ indicator- datetime- wily-armhf- ci/62/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/indicator- datetime- ci/372/ rebuild
http://