Merge lp:~allenap/launchpad/disconnection-testing-errors-bug-871596 into lp:launchpad

Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 14207
Proposed branch: lp:~allenap/launchpad/disconnection-testing-errors-bug-871596
Merge into: lp:launchpad
Diff against target: 36 lines (+2/-6)
2 files modified
lib/canonical/librarian/tests/test_db_outage.py (+0/-4)
versions.cfg (+2/-2)
To merge this branch: bzr merge lp:~allenap/launchpad/disconnection-testing-errors-bug-871596
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+80661@code.launchpad.net

Commit message

Use pgbouncer 0.0.7 and storm 0.19.0.99-lpwithnodatetime-r402.

Description of the change

Use more recent versions of Storm and pgbouncer to fix disconnection
errors in the test suite.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/librarian/tests/test_db_outage.py'
2--- lib/canonical/librarian/tests/test_db_outage.py 2011-09-05 16:44:36 +0000
3+++ lib/canonical/librarian/tests/test_db_outage.py 2011-10-28 11:58:27 +0000
4@@ -60,10 +60,6 @@
5 def testSetUp(cls):
6 cls.pgbouncer_fixture.start()
7
8- @classmethod
9- def testTearDown(cls):
10- cls.pgbouncer_fixture.start()
11-
12
13 class TestLibrarianDBOutage(TestCase):
14 layer = PGBouncerLibrarianLayer
15
16=== modified file 'versions.cfg'
17--- versions.cfg 2011-10-25 19:12:37 +0000
18+++ versions.cfg 2011-10-28 11:58:27 +0000
19@@ -57,7 +57,7 @@
20 paramiko = 1.7.4
21 Paste = 1.7.2
22 PasteDeploy = 1.3.3
23-pgbouncer = 0.0.5
24+pgbouncer = 0.0.7
25 plone.recipe.command = 1.1
26 psycopg2 = 2.2.2
27 pyasn1 = 0.0.9a
28@@ -89,7 +89,7 @@
29 soupmatchers = 0.1r53
30 sourcecodegen = 0.6.9
31 # lp:~launchpad-committers/storm/with-without-datetime
32-storm = 0.19.0.99-lpwithnodatetime-r399
33+storm = 0.19.0.99-lpwithnodatetime-r402
34 testresources = 0.2.4-r58
35 testtools = 0.9.12-r228
36 timeline = 0.0.1