sync-monitor

Merge lp://qastaging/~renatofilho/sync-monitor/fix-1306112 into lp://qastaging/sync-monitor

fix-1306112
Merge into trunk

Proposed by Renato Araujo Oliveira Filho on 2014-04-10

Status:

Merged

Approved by:

Bill Filler on 2014-04-15

Approved revision:

Merged at revision:

Proposed branch:

lp://qastaging/~renatofilho/sync-monitor/fix-1306112

Merge into:

lp://qastaging/sync-monitor

Diff against target:

530 lines (+349/-36)

7 files modified

src/eds-helper.cpp (+101/-30)
src/eds-helper.h (+27/-5)
src/sync-configure.cpp (+2/-0)
src/sync-daemon.cpp (+9/-0)
tests/unittest/CMakeLists.txt (+6/-1)
tests/unittest/eds-helper-mock.h (+59/-0)
tests/unittest/eds-helper-test.cpp (+145/-0)

To merge this branch:

bzr merge lp://qastaging/~renatofilho/sync-monitor/fix-1306112

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-04-15
Bill Filler (community)		2014-04-10	Approve on 2014-04-15
Review via email: mp+215268@code.qastaging.launchpad.net

Commit message

Keep a collection cache to compare with changed events.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-10:

PASSED: Continuous integration, rev:21
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-i386-ci/42

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/42/rebuild

review: Approve (continuous-integration)

lp://qastaging/~renatofilho/sync-monitor/fix-1306112 updated on 2014-04-10

22. By Renato Araujo Oliveira Filho on 2014-04-10: Created unit test for eds-helper class.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-10:

FAILED: Continuous integration, rev:22
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/43/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-amd64-ci/43/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-armhf-ci/43/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-i386-ci/43/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/43/rebuild

review: Needs Fixing (continuous-integration)

lp://qastaging/~renatofilho/sync-monitor/fix-1306112 updated on 2014-04-10

23. By Renato Araujo Oliveira Filho on 2014-04-10: Fixed unit test.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-10:

PASSED: Continuous integration, rev:23
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/44/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-armhf-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-armhf-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-i386-ci/44

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/44/rebuild

review: Approve (continuous-integration)

lp://qastaging/~renatofilho/sync-monitor/fix-1306112 updated on 2014-04-15

24. By Renato Araujo Oliveira Filho on 2014-04-15: Avoid use the new qt5 signal/slot connection syntax. (Looks like this is not working correct on powerpc)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-15:

PASSED: Continuous integration, rev:24
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/48/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-armhf-ci/48/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-i386-ci/48

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/48/rebuild

review: Approve (continuous-integration)

lp://qastaging/~renatofilho/sync-monitor/fix-1306112 updated on 2014-04-15

25. By Renato Araujo Oliveira Filho on 2014-04-15: Limit the number of dirlogs to 2.

Revision history for this message

Bill Filler (bfiller) wrote on 2014-04-15:

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

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-15:

PASSED: Continuous integration, rev:25
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/50/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-armhf-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-armhf-ci/50/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-trusty-i386-ci/50