Merge lp:~free.ekanayaka/storm/fake-transaction into lp:storm

[Free Ekanayaka]

This branch changes the FakeTransactor to use a fake transaction by default, as in most tests a real commit is not needed. It's possible to pass the real Zope transaction manager (or anther one) with the "transaction" parameter.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'NEWS'
--- NEWS	2012-03-30 08:28:46 +0000
+++ NEWS	2012-06-07 13:00:27 +0000
@@ -38,6 +38,10 @@
   will keep the same behavior on Postgres < 9 as it's equivalent to
   SERIALIZABLE, but it will be less strict on Postgres >= 9.
 
+- The store.twisted.testing.FakeTransactor test helper now uses a fake
+  transaction by default, so tests won't perform real commits as it's
+  not generally needed.
+
 Bug fixes
 ---------
 

=== modified file 'storm/twisted/testing.py'
--- storm/twisted/testing.py	2011-11-30 14:16:50 +0000
+++ storm/twisted/testing.py	2012-06-07 13:00:27 +0000
@@ -1,5 +1,3 @@
-import transaction
-
 from twisted.python.failure import Failure
 from twisted.internet.defer import execute
 
@@ -23,6 +21,15 @@
         onResult(success, result)
 
 
+class FakeTransaction(object):
+
+    def commit(self):
+        pass
+
+    def abort(self):
+        pass
+
+
 class FakeTransactor(Transactor):
     """
     A fake C{Transactor} wrapper that runs the given function in the main
@@ -37,10 +44,10 @@
 
     sleep = lambda *args, **kwargs: None
 
-    def __init__(self, _transaction=None):
-        if _transaction is None:
-            _transaction = transaction
-        self._transaction = _transaction
+    def __init__(self, transaction=None):
+        if transaction is None:
+            transaction = FakeTransaction()
+        self._transaction = transaction
 
     def run(self, function, *args, **kwargs):
         deferred = execute(self._wrap, function, *args, **kwargs)

=== modified file 'storm/twisted/transact.py'
--- storm/twisted/transact.py	2011-12-07 10:39:57 +0000
+++ storm/twisted/transact.py	2012-06-07 13:00:27 +0000
@@ -1,6 +1,6 @@
 import time
 import random
-import transaction
+import transaction as zope_transaction
 
 from functools import wraps
 
@@ -45,11 +45,11 @@
     sleep = time.sleep
     uniform = random.uniform
 
-    def __init__(self, threadpool, _transaction=None):
+    def __init__(self, threadpool, transaction=None):
         self._threadpool = threadpool
-        if _transaction is None:
-            _transaction = transaction
-        self._transaction = _transaction
+        if transaction is None:
+            transaction = zope_transaction
+        self._transaction = transaction
 
     def run(self, function, *args, **kwargs):
         """Run C{function} in a thread.