Launchpad itself

Merge lp:~frankban/launchpad/bug-1011847 into lp:launchpad

  1. bug-1011847
  2. Merge into devel
Proposed by Francesco Banconi
Status: Merged
Approved by: Graham Binns
Approved revision: no longer in the source branch.
Merged at revision: 15398
Proposed branch: lp:~frankban/launchpad/bug-1011847
Merge into: lp:launchpad
Diff against target: 12 lines (+1/-1)
1 file modified
lib/lp/services/webapp/tests/test_error.py (+1/-1)
To merge this branch: bzr merge lp:~frankban/launchpad/bug-1011847
Reviewer Review Type Date Requested Status
Graham Binns (community) code Approve
Review via email: mp+109789@code.launchpad.net

Commit message

Fixed intermittent failure in lp.services.webapp.tests.test_error.TestDatabaseErrorViews.test_disconnectionerror_view_integration

Description of the change

= Summary =

The failure is similar to what already seen in bug 1003040. This time the SERVICE_UNAVAILABLE error is raised while trying to connect to the url before (and not after) the bouncer is stopped.

== Changes ==

Added retryConnection to that part too.

== Tests ==

bin/test -cvvt lp.services.webapp.tests.test_error.TestDatabaseErrorViews.test_disconnectionerror_view_integration

No QA

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/services/webapp/tests/test_error.py'
2--- lib/lp/services/webapp/tests/test_error.py 2012-06-07 12:08:47 +0000
3+++ lib/lp/services/webapp/tests/test_error.py 2012-06-12 09:33:41 +0000
4@@ -91,7 +91,7 @@
5 self.useFixture(bouncer)
6 # Verify things are working initially.
7 url = 'http://launchpad.dev/'
8- urllib2.urlopen(url)
9+ self.retryConnection(url)
10 # Now break the database, and we get an exception, along with
11 # our view.
12 bouncer.stop()