history-service

Merge lp://staging/~boiko/history-service/fix_contact_matching_crash into lp://staging/history-service

  1. fix_contact_matching_crash
  2. Merge into trunk
Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Tiago Salem Herrmann
Approved revision: 194
Merged at revision: 193
Proposed branch: lp://staging/~boiko/history-service/fix_contact_matching_crash
Merge into: lp://staging/history-service
Diff against target: 105 lines (+54/-3)
2 files modified
historyprivate/contactmatcher.cpp (+4/-3)
tests/historyprivate/ContactMatcherTest.cpp (+50/-0)
To merge this branch: bzr merge lp://staging/~boiko/history-service/fix_contact_matching_crash
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Tiago Salem Herrmann (community) Approve
Review via email: mp+257686@code.staging.launchpad.net

Commit message

Fix a crash that was happening when matching new contacts. Also add a unit test to make sure it doesn't happen again.

Description of the change

Fix a crash that was happening when matching new contacts. Also add a unit test to make sure it doesn't happen again.

== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
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/<package-name>) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

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

PASSED: Continuous integration, rev:193
http://jenkins.qa.ubuntu.com/job/history-service-ci/181/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/19

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/181/rebuild

review: Approve (continuous-integration)
lp://staging/~boiko/history-service/fix_contact_matching_crash updated
194. By Gustavo Pichorim Boiko

Fix contact removal info clearing too.

Revision history for this message
Tiago Salem Herrmann (tiagosh) wrote :

Looks good.

--Checklist--

Did you perform an exploratory manual test run of the code change and any related functionality 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 :

PASSED: Continuous integration, rev:194
http://jenkins.qa.ubuntu.com/job/history-service-ci/182/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/182/rebuild

review: Approve (continuous-integration)

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