Ubuntu UI Toolkit

Merge lp://staging/~renatofilho/ubuntu-ui-toolkit/limit-alarms-fetch into lp://staging/ubuntu-ui-toolkit

  1. limit-alarms-fetch
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Merged at revision: 948
Proposed branch: lp://staging/~renatofilho/ubuntu-ui-toolkit/limit-alarms-fetch
Merge into: lp://staging/ubuntu-ui-toolkit
Diff against target: 36 lines (+14/-1)
2 files modified
modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp (+13/-0)
tests/unit/tst_alarms/tst_alarms.cpp (+1/-1)
To merge this branch: bzr merge lp://staging/~renatofilho/ubuntu-ui-toolkit/limit-alarms-fetch
Reviewer Review Type Date Requested Status
Zsombor Egri Approve
PS Jenkins bot continuous-integration Approve
Nicholas Skaggs (community) Approve
Review via email: mp+207629@code.staging.launchpad.net

Commit message

[alarms] Filter only alarms of the current week.

Description of the change

This is necessary because query for events without a valid date interval will return all events on the database, including the recurrence ones.
Ex. A alarm that recurs every day, will be returned infinite times.

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

FAILED: Continuous integration, rev:948
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1752/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3394
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3048
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/700
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/700
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/700/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2991
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3396
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3396/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3050
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3050/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5446
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4182

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1752/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

Shouldn't we filter 1 full week ahead? The order the alarms should be collected is having the next upcoming event as the first one in the list..

Please make a FIXME note that this is a temporary workaround until we get a proper performant fetching for all occurrences.

review: Needs Fixing
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Tested on clock and calendar, tests now pass properly without EDS warnings/crashes.

review: Approve
lp://staging/~renatofilho/ubuntu-ui-toolkit/limit-alarms-fetch updated
949. By Renato Araujo Oliveira Filho

Instead of return the current events we will return the next 7 days events, to make sure that they will be returned in the correct order.

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

FAILED: Continuous integration, rev:949
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1754/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3405
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3057
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/702
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/702
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/702/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3000
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3407
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3407/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3059
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3059/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5454
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4193

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1754/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~renatofilho/ubuntu-ui-toolkit/limit-alarms-fetch updated
950. By Renato Araujo Oliveira Filho

Fixed alarm test to work with the new limited query.

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

FAILED: Continuous integration, rev:950
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1756/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3412
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3061
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/704
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/704
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/704/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3006
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3414
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3414/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3063
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3063/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5457
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4199

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1756/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~renatofilho/ubuntu-ui-toolkit/limit-alarms-fetch updated
951. By Renato Araujo Oliveira Filho

Fixed the alarm fetch.

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

PASSED: Continuous integration, rev:951
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1757/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3417
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3065
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/705
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/705
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/705/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3010
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3419
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3419/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3067
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3067/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5460
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4202

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1757/rebuild

review: Approve (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) :
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

to status/vote changes: