Merge lp:~therve/storm/earlier-register-transaction into lp:storm

[Thomas Herve]

The branch moves the event, and add a whitebox test.

[Jamu Kakar (jkakar)]

Nice one, +1!

review: Approve

[Stuart Bishop (stub)]

Looks good.

review: Approve

=== modified file 'storm/database.py'
--- storm/database.py	2010-04-16 07:14:25 +0000
+++ storm/database.py	2011-08-01 12:57:52 +0000
@@ -224,9 +224,9 @@
             raise ClosedError("Connection is closed")
         if self._blocked:
             raise ConnectionBlockedError("Access to connection is blocked")
-        self._ensure_connected()
         if self._event:
             self._event.emit("register-transaction")
+        self._ensure_connected()
         if isinstance(statement, Expr):
             if params is not None:
                 raise ValueError("Can't pass parameters with expressions")

=== modified file 'tests/store/base.py'
--- tests/store/base.py	2011-07-14 11:15:30 +0000
+++ tests/store/base.py	2011-08-01 12:57:52 +0000
@@ -28,7 +28,7 @@
 import weakref
 
 from storm.references import Reference, ReferenceSet, Proxy
-from storm.database import Result
+from storm.database import Result, STATE_DISCONNECTED
 from storm.properties import (
     Int, Float, RawStr, Unicode, Property, Pickle, UUID)
 from storm.properties import PropertyPublisherMeta, Decimal
@@ -40,7 +40,7 @@
 from storm.exceptions import (
     ClosedError, ConnectionBlockedError, FeatureError, LostObjectError,
     NoStoreError, NotFlushedError, NotOneError, OrderLoopError, UnorderedError,
-    WrongStoreError)
+    WrongStoreError, DisconnectionError)
 from storm.cache import Cache
 from storm.store import AutoReload, EmptyResultSet, Store, ResultSet
 from storm.tracer import debug
@@ -5959,6 +5959,20 @@
         self.assertEqual(len(calls), 1)
         self.assertEqual(calls[0], self.store)
 
+    def test_wb_event_before_check_connection(self):
+        """
+        The register-transaction event is emitted before checking the state of
+        the connection.
+        """
+        calls = []
+        def register_transaction(owner):
+            calls.append(owner)
+        self.store._event.hook("register-transaction", register_transaction)
+        self.store._connection._state = STATE_DISCONNECTED
+        self.assertRaises(DisconnectionError, self.store.execute, "SELECT 1")
+        self.assertEqual(len(calls), 1)
+        self.assertEqual(calls[0], self.store)
+
     def test_add_sends_event(self):
         """Adding an object emits the register-transaction event."""
         calls = []