qtorganizer5-eds

Merge lp://qastaging/~renatofilho/qtorganizer5-eds/fix-1283859 into lp://qastaging/qtorganizer5-eds

  1. fix-1283859
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Bill Filler
Approved revision: 52
Merged at revision: 51
Proposed branch: lp://qastaging/~renatofilho/qtorganizer5-eds/fix-1283859
Merge into: lp://qastaging/qtorganizer5-eds
Diff against target: 362 lines (+168/-26)
7 files modified
.bzrignore (+1/-0)
qorganizer/qorganizer-eds-engine.cpp (+24/-4)
qorganizer/qorganizer-eds-engine.h (+1/-1)
qorganizer/qorganizer-eds-fetchrequestdata.cpp (+8/-2)
qorganizer/qorganizer-eds-saverequestdata.cpp (+15/-0)
qorganizer/qorganizer-eds-saverequestdata.h (+1/-0)
tests/unittest/recurrence-test.cpp (+118/-19)
To merge this branch: bzr merge lp://qastaging/~renatofilho/qtorganizer5-eds/fix-1283859
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+215592@code.qastaging.launchpad.net

Commit message

Implemented support to update recurrence items with different modes.
* All (E_CAL_OBJ_MOD_ALL);
* A single instance (E_CAL_OBJ_MOD_THIS),
* A specific set of instances (E_CAL_OBJ_MOD_THIS_AND_PRIOR and E_CAL_OBJ_MOD_THIS_AND_FUTURE)

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

FAILED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/127/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-amd64-ci/116/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/114/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-i386-ci/114/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/127/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~renatofilho/qtorganizer5-eds/fix-1283859 updated
50. By Renato Araujo Oliveira Filho

Used timezones on tests datetime values to avoid problems when running in different timezones.

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

PASSED: Continuous integration, rev:50
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/128/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-amd64-ci/117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/115
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/115/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-i386-ci/115

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/128/rebuild

review: Approve (continuous-integration)
lp://qastaging/~renatofilho/qtorganizer5-eds/fix-1283859 updated
51. By Renato Araujo Oliveira Filho

Fixed memory leak on strings.

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

FAILED: Continuous integration, rev:51
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/129/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-amd64-ci/118/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/116
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-i386-ci/116

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/129/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

This seems to fix the bug I found testing in comment 5 and 6 of bug #1283858, I can't reproduce the behavior while using this patch.

lp://qastaging/~renatofilho/qtorganizer5-eds/fix-1283859 updated
52. By Renato Araujo Oliveira Filho

Updated ignored file list.

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

PASSED: Continuous integration, rev:52
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/132/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-amd64-ci/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/119
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-i386-ci/119

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/132/rebuild

review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

Did you perform an exploratory manual test run of the 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/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

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