Indicator Date and Time

Merge lp://qastaging/~charlesk/indicator-datetime/lp-1560960-use-dbusmock-timedated-template into lp://qastaging/indicator-datetime/15.10

  1. lp-1560960-use-dbusmock-timedated-template
  2. Merge into trunk.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
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: mp+291446@code.qastaging.launchpad.net

Commit message

Use dbusmock's timedated template in our tests

Description of the change

Minor patch on top of https://code.launchpad.net/~charlesk/indicator-datetime/always-get-initial-tzid-from-timedate1/+merge/291421 .

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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:448
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/372/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/62/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/372/rebuild

review: Approve (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

looks good.

review: Approve
lp://qastaging/~charlesk/indicator-datetime/lp-1560960-use-dbusmock-timedated-template updated
449. By Charles Kerr

sync with lp:~charlesk/indicator-datetime/always-get-initial-tzid-from-timedate1/

Revision history for this message
Charles Kerr (charlesk) wrote :

re-approving because the r449 was already approved in prerequisite branch

Revision history for this message
Charles Kerr (charlesk) :
review: Approve

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