Merge lp:~sidnei/storm/disconnection-send-data into lp:storm

[Sidnei da Silva]

Treat 'could not send data to server' as a DisconnectionError too.

Treat 'could not send data to server' as a DisconnectionError too.

[Jamu Kakar (jkakar)]

Nice one, +1!

review: Approve

[Free Ekanayaka (free.ekanayaka)]

Looks good, thanks for adding the additional test. +1!

review: Approve

=== modified file 'storm/databases/postgres.py'
--- storm/databases/postgres.py	2012-04-04 23:44:02 +0000
+++ storm/databases/postgres.py	2013-09-25 22:08:29 +0000
@@ -322,6 +322,7 @@
                 "connection not open" in msg or
                 "could not connect to server" in msg or
                 "could not receive data from server" in msg or
+                "could not send data to server" in msg or
                 "losed the connection unexpectedly" in msg or
                 "no connection to the server" in msg or
                 "server closed the connection unexpectedly" in msg or

=== modified file 'tests/databases/postgres.py'
--- tests/databases/postgres.py	2012-06-12 10:00:51 +0000
+++ tests/databases/postgres.py	2013-09-25 22:08:29 +0000
@@ -28,7 +28,7 @@
 from storm.variables import DateTimeVariable, RawStrVariable
 from storm.variables import ListVariable, IntVariable, Variable
 from storm.properties import Int
-from storm.exceptions import DisconnectionError
+from storm.exceptions import DisconnectionError, OperationalError
 from storm.expr import (Union, Select, Insert, Update, Alias, SQLRaw, State,
                         Sequence, Like, Column, COLUMN)
 from storm.tracer import install_tracer, TimeoutError
@@ -579,12 +579,30 @@
         exc = ProgrammingError("SSL SYSCALL error: Connection timed out")
         self.assertTrue(self.connection.is_disconnection_error(exc))
 
+    def test_is_disconnection_error_with_could_not_send_data(self):
+        """
+        If the underlying driver raises an OperationalError with 'could not
+        send data to server', we consider the connection
+        dead and mark it as needing reconnection.
+        """
+        exc = OperationalError("could not send data to server")
+        self.assertTrue(self.connection.is_disconnection_error(exc))
+
+    def test_is_disconnection_error_with_could_not_receive_data(self):
+        """
+        If the underlying driver raises an OperationalError with 'could not
+        receive data from server', we consider the connection
+        dead and mark it as needing reconnection.
+        """
+        exc = OperationalError("could not receive data from server")
+        self.assertTrue(self.connection.is_disconnection_error(exc))
+
 
 _max_prepared_transactions = None
 
 
 class PostgresTwoPhaseCommitTest(TwoPhaseCommitTest, TestHelper):
-    
+
     def is_supported(self):
         uri = os.environ.get("STORM_POSTGRES_URI")
         if not uri: