Merge lp:~wgrant/storm/psycopg2-2.4-pgbouncer into lp:storm

[William Grant]

Fix pgbouncer disconnect handling with psycopg2 2.4.

Storm has a bit of a hack to catch and ignore a ProgrammingError raised by disconnection caused by pgbouncer shutdown. That works fine in oldish psycopg2 releases. But psycopg2 2.4 raises a plain DatabaseError, which propagates up and breaks tests and applications alike. This branch alters Storm to catch DatabaseError in general (ProgrammingError is a subclass), making it work in psycopg2 2.4 as well. I undisabled the relevant tests (they were being skipped when using 2.4 due to this bug). All tests pass on Lucid and Precise.

[Stuart Bishop (stub)]

This looks good.

review: Approve

[David Britton (davidpbritton)]

Confirmed tests passing on precise. great!

[Thomas Herve (therve)]

Looks great, +1!

review: Approve

=== modified file 'storm/databases/postgres.py'
--- storm/databases/postgres.py	2012-03-30 08:22:35 +0000
+++ storm/databases/postgres.py	2012-04-05 00:14:19 +0000
@@ -308,9 +308,10 @@
 
         if isinstance(exc, disconnection_errors):
             # When the connection is closed by a termination of pgbouncer, a
-            # ProgrammingError is raised. If the raw connection is closed we
-            # assume it's actually a disconnection.
-            if isinstance(exc, ProgrammingError):
+            # DatabaseError or subclass with no message (depending on
+            # psycopg2 version) is raised. If the raw connection is closed
+            # we assume it's actually a disconnection.
+            if isinstance(exc, DatabaseError):
                 if self._raw_connection.closed:
                     return True
             msg = str(exc)

=== modified file 'tests/databases/postgres.py'
--- tests/databases/postgres.py	2012-03-30 08:22:35 +0000
+++ tests/databases/postgres.py	2012-04-05 00:14:19 +0000
@@ -39,7 +39,7 @@
 import storm.info
 storm  # Silence lint.
 
-from tests import has_fixtures, has_psycopg, has_subunit
+from tests import has_fixtures, has_subunit
 from tests.databases.base import (
     DatabaseTest, DatabaseDisconnectionTest, UnsupportedDatabaseTest)
 from tests.expr import column1, column2, column3, elem1, table1, TrackContext
@@ -704,14 +704,6 @@
             DisconnectionError, connection.execute,
             "SELECT current_database()")
 
-    if has_psycopg:
-        import psycopg2
-        psycopg2_version = psycopg2.__version__.split(None, 1)[0]
-        if psycopg2_version in ("2.4", "2.4.1", "2.4.2"):
-            test_pgbouncer_stopped.skip = (
-                "Fails with pyscopg2 %s; see https://bugs.launchpad"
-                ".net/storm/+bug/900702.") % psycopg2_version
-
 
 if has_fixtures:
     # Upgrade to full test case class with fixtures.

=== modified file 'tests/helper.py'
--- tests/helper.py	2011-12-07 11:57:07 +0000
+++ tests/helper.py	2012-04-05 00:14:19 +0000
@@ -66,13 +66,6 @@
                 result.startTest(self)
                 result.addSkip(self, "Test not supported")
             return
-        # Skip if the test method has a non-None skip attribute.
-        skip = getattr(self._testMethod, "skip", None)
-        if skip is not None:
-            if hasattr(result, "addSkip"):
-                result.startTest(self)
-                result.addSkip(self, skip)
-            return
         super(TestHelper, self).run(result)
 
     def assertVariablesEqual(self, checked, expected):