Merge lp://qastaging/~renatofilho/qtorganizer5-eds/limit-number-of-events into lp://qastaging/qtorganizer5-eds

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 35
Merged at revision: 33
Proposed branch: lp://qastaging/~renatofilho/qtorganizer5-eds/limit-number-of-events
Merge into: lp://qastaging/qtorganizer5-eds
Diff against target: 151 lines (+35/-18)
5 files modified
qorganizer/qorganizer-eds-engine.cpp (+15/-0)
qorganizer/qorganizer-eds-fetchrequestdata.cpp (+12/-11)
tests/unittest/CMakeLists.txt (+2/-1)
tests/unittest/collections-test.cpp (+1/-1)
tests/unittest/event-test.cpp (+5/-5)
To merge this branch: bzr merge lp://qastaging/~renatofilho/qtorganizer5-eds/limit-number-of-events
Reviewer Review Type Date Requested Status
Nicholas Skaggs (community) Approve
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+207542@code.qastaging.launchpad.net

Commit message

Limited the number of events returned when no date interval is specified.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
35. By Renato Araujo Oliveira Filho

Ignore return from calendar-factory when running the tests.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Ran the ubuntu_clock_app AP tests on image 196 first without this new deb and then with it. The alarms test register the same failures as outlined in the bug as before this change.

For the calendar app, I ran the same test suite both without this new deb, and then with it. It successfully fixes the issue for calendar. The test suite runs properly with this change :-)

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

From my perspective, I approve the change to correct calendar, allowing us to get a working version of the app. However, clock is still affected, which is problematic. Can clock issues also be worked or ?

review: Needs Information
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :
review: Approve
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Are there any related MPs required for this MP to build/function as expected? NO
Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes) : YES
Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?: YES
Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/qtorganizer5-eds) on device or emulator? YES
If you changed the UI, was the change specified/approved by design? NO UI CHANGE
If you changed the packaging (debian), did you subscribe a core-dev to this MP? NO PACKAGE CHANGE

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

Test plan:

Install latest (trusty-proposed) image on phone
Used image 196

Install freshly build MPs that are needed for landing
Grabbed debs from jenkins output and installed

Ensure that all unit tests pass on the device.
Ensure that Calendar app works as expected on device
As above, reproduced the bug, then installed the fix and calendar works properly, fixing the bug, and showing no other regressions.

Ensure that Clock app works as expected on device
No new regressions introduced. The fix for the current bug in trunk is not fixed by this change. The change is required in the toolkit, and the merge is here: https://code.launchpad.net/~renatofilho/ubuntu-ui-toolkit/limit-alarms-fetch/+merge/207629

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