Indicator Date and Time

Merge lp://staging/~charlesk/indicator-datetime/lp-1411171-strengthen-recurrence-rule-test into lp://staging/indicator-datetime/15.04

  1. lp-1411171-strengthen-recurrence-rule-test
  2. Merge into trunk.15.04
Proposed by Charles Kerr
Status: Merged
Approved by: Antti Kaijanmäki
Approved revision: 395
Merged at revision: 394
Proposed branch: lp://staging/~charlesk/indicator-datetime/lp-1411171-strengthen-recurrence-rule-test
Merge into: lp://staging/indicator-datetime/15.04
Diff against target: 46 lines (+12/-2)
3 files modified
src/engine-eds.cpp (+5/-2)
src/main.cpp (+1/-0)
tests/manual (+6/-0)
To merge this branch: bzr merge lp://staging/~charlesk/indicator-datetime/lp-1411171-strengthen-recurrence-rule-test
Reviewer Review Type Date Requested Status
Antti Kaijanmäki (community) Approve
PS Jenkins bot (community) continuous-integration Approve
dobey (community) Approve
Review via email: mp+246629@code.staging.launchpad.net

Commit message

Fix bug that misidentified repeating alarms as one-time alarms, causing them to be disabled after triggering.

Description of the change

=== Change Description

Fix bug that misidentified repeating alarms as one-time alarms, causing them to be disabled after triggering.

RTM MP @ https://code.launchpad.net/~charlesk/indicator-datetime/lp-1411171-strengthen-recurrence-rule-test/+merge/246633

=== MP Checklist

> Are there any related MPs required for this MP to build/function as expected? Please list.

No prerequisites

> Is your branch in sync with latest trunk? (e.g. bzr pull lp:trunk -> no changes)

Yes

> Did the code build without warnings?

Yes

> Did the tests run successfully?

Yes

> Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

> If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

> What device (or emulator) has your component test plan been executed successfully on?

Krillin 198

> What manual tests are relevant for this MP?

indicator-datetime/disable-one-time-alarms-after-notification

> Did you include a link to the MR Review Checklist Template to make your reviewer's life easier?

https://wiki.ubuntu.com/Process/Merges/Checklists/indicator-datetime

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:394
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/290/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-amd64-ci/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
lp://staging/~charlesk/indicator-datetime/lp-1411171-strengthen-recurrence-rule-test updated
395. By Charles Kerr

bump to re-run CI. clumsy, but jenkins' rebuild button isn't working

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:395
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/294/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-amd64-ci/8/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/8/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:395
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/295/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/9/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

LGTM.

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