Merge lp://staging/~michihenning/unity-scopes-api/fix-dns-timeout into lp://staging/unity-scopes-api

Proposed by Michi Henning
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 312
Merged at revision: 313
Proposed branch: lp://staging/~michihenning/unity-scopes-api/fix-dns-timeout
Merge into: lp://staging/unity-scopes-api
Diff against target: 104 lines (+19/-16)
2 files modified
test/gtest/scopes/qt/JsonAsyncReader/JsonAsyncReader_test.cpp (+15/-12)
test/gtest/scopes/qt/XmlAsyncReader/XmlAsyncReader_test.cpp (+4/-4)
To merge this branch: bzr merge lp://staging/~michihenning/unity-scopes-api/fix-dns-timeout
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+249432@code.staging.launchpad.net

Commit message

Fixed sporadic failure in JsonAsyncReader test caused by slow DNS.
Improved tests to report exception details if an exception other than
the expected one is thrown.

Description of the change

Fixed sporadic failure in JsonAsyncReader test caused by slow DNS.
Improved tests to report exception details if an exception other than
the expected one is thrown.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

+1

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 all changes: