Merge lp://staging/~jamesh/ubuntu-scopes/googlenews-test-fixes into lp://staging/~submarine/ubuntu-scopes/googlenews
Proposed by
James Henstridge
| Status: | Merged |
|---|---|
| Approved by: | Didier Roche-Tolomelli |
| Approved revision: | 56 |
| Merged at revision: | 54 |
| Proposed branch: | lp://staging/~jamesh/ubuntu-scopes/googlenews-test-fixes |
| Merge into: | lp://staging/~submarine/ubuntu-scopes/googlenews |
| Diff against target: |
110 lines (+17/-14) 3 files modified
src/unity_googlenews_daemon.py (+14/-14) tests/data/mock_geoiplookup.js (+1/-0) tests/test_googlenews.py (+2/-0) |
| To merge this branch: | bzr merge lp://staging/~jamesh/ubuntu-scopes/googlenews-test-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Submarine | Pending | ||
|
Review via email:
|
|||
Commit message
Test suite fixes: remove the LOC global variable, and don't hit the network for the location check.
Description of the change
The initialisation of the unused LOC global variable failed under the test suite where no locale is set, so I have removed it.
I have also short circuited the geoiplookup.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| David Callé (davidc3) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:55
http://
Executed test runs:
FAILURE: http://
Click here to trigger a rebuild:
http://