Merge lp:~stolowski/unity-scope-click/remove-assertion-and-old-api-fallback into lp:unity-scope-click/devel
Proposed by
Paweł Stołowski
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | dobey | ||||
Approved revision: | 354 | ||||
Merged at revision: | 356 | ||||
Proposed branch: | lp:~stolowski/unity-scope-click/remove-assertion-and-old-api-fallback | ||||
Merge into: | lp:unity-scope-click/devel | ||||
Diff against target: |
137 lines (+23/-34) 3 files modified
scope/clickstore/store-query.cpp (+23/-18) scope/clickstore/store-scope.cpp (+0/-12) scope/clickstore/store-scope.h (+0/-4) |
||||
To merge this branch: | bzr merge lp:~stolowski/unity-scope-click/remove-assertion-and-old-api-fallback | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
dobey (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+227719@code.launchpad.net |
Commit message
Remove fallback to old server API if highlights call fails, this was needed only initially when server was not ready. Ensure we call ad highlights only if there was no network error (check general status, not the http code). Replaced assert with warning and early return.
Description of the change
Remove fallback to old server API if highlights call fails, this was needed only initially when server was not ready. Ensure we call ad highlights only if there was no network error (check general status, not the http code). Replaced assert with warning and early return.
No new tests, since this is existing functionality and this change makes it more robust.
To post a comment you must log in.
PASSED: Continuous integration, rev:354 jenkins. qa.ubuntu. com/job/ unity-team- unity-scope- click-devel- ci/228/ jenkins. qa.ubuntu. com/job/ unity-team- unity-scope- click-devel- utopic- amd64-ci/ 203 jenkins. qa.ubuntu. com/job/ unity-team- unity-scope- click-devel- utopic- armhf-ci/ 202 jenkins. qa.ubuntu. com/job/ unity-team- unity-scope- click-devel- utopic- armhf-ci/ 202/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity-team- unity-scope- click-devel- utopic- i386-ci/ 202
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- team-unity- scope-click- devel-ci/ 228/rebuild
http://