--- a/iro/tests/offer_integrated.py Wed Mar 21 19:43:36 2012 +0100
+++ b/iro/tests/offer_integrated.py Fri Mar 23 16:16:56 2012 +0100
@@ -17,31 +17,11 @@
from iro.offer.smstrade import SmstradeException, StatusCode
from ..test_helpers.dbtestcase import DBTestCase
-
-class DummyPool():
- def run(self, f,*a,**k):
- return f(*a,**k)
+from ..test_helpers.utils import DummyPool
def run( f,*a,**k):
return f(*a,**k)
-from twisted.python import log
-
-class DummyObserver(object):
- def __init__(self):
- self.e=[]
-
- def start(self):
- log.addObserver(self.emit)
-
- def stop(self):
- log.removeObserver(self.emit)
-
- def emit(self, eventDict):
- self.e.append(eventDict)
-
-
-
class IntegratedOfferTests(DBTestCase):
def setUp(self):
DBTestCase.setUp(self)
@@ -51,11 +31,7 @@
self.taskPool = taskPool.run
taskPool.run = run
- self.log = DummyObserver()
- self.log.start()
-
def tearDown(self):
- self.log.stop()
exJobs.clear()
data.pool = self.pool
self.pool = None