moving DummyObserver and DummyPool -> iro.test_helpers.utils
DBTestCase now using DummyObserver out of the box
--- a/iro/test_helpers/dbtestcase.py Wed Mar 21 19:43:36 2012 +0100
+++ b/iro/test_helpers/dbtestcase.py Fri Mar 23 16:16:56 2012 +0100
@@ -13,6 +13,8 @@
from iro.controller.pool import dbPool
+from .utils import DummyObserver
+
class DBTestCase(unittest.TestCase):
'''a TestCase with DB connection
you have to set self.session manually in setUp'''
@@ -22,8 +24,11 @@
def setUp(self):
md.setUp()
+ self.log = DummyObserver()
+ self.log.start()
def tearDown(self):
+ self.log.stop()
self.__cleanDB()
def session(self,autocommit=True):
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/iro/test_helpers/utils.py Fri Mar 23 16:16:56 2012 +0100
@@ -0,0 +1,18 @@
+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 DummyPool():
+ def run(self, f,*a,**k):
+ return f(*a,**k)
--- a/iro/tests/install.py Wed Mar 21 19:43:36 2012 +0100
+++ b/iro/tests/install.py Fri Mar 23 16:16:56 2012 +0100
@@ -6,23 +6,11 @@
from iro import install
from iro import config
-from iro.model.schema import Base
-
+from iro.model.schema import Base, Offer
+from iro.model.utils import WithSession
+from iro.offer.provider import providers, Provider
from ..test_helpers.dbtestcase import md, SampleDatabase
-
-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)
-
+from ..test_helpers.utils import DummyObserver
class TestInstallation(unittest.TestCase):
'''test install script'''
--- a/iro/tests/job.py Wed Mar 21 19:43:36 2012 +0100
+++ b/iro/tests/job.py Fri Mar 23 16:16:56 2012 +0100
@@ -16,25 +16,7 @@
from iro.validate import vInteger
from ..test_helpers.dbtestcase import DBTestCase
-
-class DummyPool():
- def run(self, 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)
+from ..test_helpers.utils import DummyPool
class JobTestCase(DBTestCase):
def setUp(self):
@@ -114,8 +96,6 @@
class StatiTest(JobTestCase):
def setUp(self):
JobTestCase.setUp(self)
- self.log = DummyObserver()
- self.log.start()
with self.session() as session:
u = User(name='test',apikey='abcdef123456789')
@@ -130,7 +110,6 @@
self.job = exJobs.create(u, [Telnumber('123456789')], SMS('test'), [])
def tearDown(self):
- self.log.stop()
JobTestCase.tearDown(self)
--- a/iro/tests/model_validate.py Wed Mar 21 19:43:36 2012 +0100
+++ b/iro/tests/model_validate.py Fri Mar 23 16:16:56 2012 +0100
@@ -5,10 +5,7 @@
from iro.error import ValidateException
from ..test_helpers.dbtestcase import DBTestCase
-
-class DummyPool():
- def run(self, f,*a,**k):
- return f(*a,**k)
+from ..test_helpers.utils import DummyPool
class ModelVaidatorTest(DBTestCase):
"""tests for the model vaidators"""
--- 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
--- a/iro/tests/viewinterface.py Wed Mar 21 19:43:36 2012 +0100
+++ b/iro/tests/viewinterface.py Fri Mar 23 16:16:56 2012 +0100
@@ -14,10 +14,7 @@
import iro.error as IroError
from ..test_helpers.dbtestcase import DBTestCase
-
-class DummyPool():
- def run(self, f,*a,**k):
- return f(*a,**k)
+from ..test_helpers.utils import DummyPool
class ViewInterfaceTest(DBTestCase):
"""tests for the xmlrpc interface"""