[Neo-report] r2399 vincent - in /trunk/neo/tests: ./ client/ functional/ master/ storage/
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Nov 2 11:16:58 CET 2010
Author: vincent
Date: Tue Nov 2 11:16:55 2010
New Revision: 2399
Log:
Call superclass' setUp & tearDown in unit tests.
Modified:
trunk/neo/tests/client/testClientApp.py
trunk/neo/tests/client/testMasterHandler.py
trunk/neo/tests/client/testStorageHandler.py
trunk/neo/tests/functional/testClient.py
trunk/neo/tests/functional/testCluster.py
trunk/neo/tests/functional/testMaster.py
trunk/neo/tests/functional/testStorage.py
trunk/neo/tests/master/testClientHandler.py
trunk/neo/tests/master/testElectionHandler.py
trunk/neo/tests/master/testMasterApp.py
trunk/neo/tests/master/testRecovery.py
trunk/neo/tests/master/testStorageHandler.py
trunk/neo/tests/master/testVerification.py
trunk/neo/tests/storage/testClientHandler.py
trunk/neo/tests/storage/testIdentificationHandler.py
trunk/neo/tests/storage/testInitializationHandler.py
trunk/neo/tests/storage/testMasterHandler.py
trunk/neo/tests/storage/testStorageApp.py
trunk/neo/tests/storage/testStorageHandler.py
trunk/neo/tests/storage/testStorageMySQLdb.py
trunk/neo/tests/storage/testTransactions.py
trunk/neo/tests/storage/testVerificationHandler.py
trunk/neo/tests/testBootstrap.py
trunk/neo/tests/testConnection.py
trunk/neo/tests/testHandler.py
trunk/neo/tests/testNodes.py
trunk/neo/tests/testProtocol.py
Modified: trunk/neo/tests/client/testClientApp.py
==============================================================================
--- trunk/neo/tests/client/testClientApp.py [iso-8859-1] (original)
+++ trunk/neo/tests/client/testClientApp.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -60,6 +60,7 @@ def failing_tryToResolveConflict(oid, co
class ClientApplicationTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
# apply monkey patches
self._getMasterConnection = Application._getMasterConnection
self._waitMessage = Application._waitMessage
@@ -73,6 +74,7 @@ class ClientApplicationTests(NeoUnitTest
Application._getMasterConnection = self._getMasterConnection
Application._waitMessage = self._waitMessage
Application._getPartitionTable = self._getPartitionTable
+ NeoUnitTestBase.tearDown(self)
# some helpers
Modified: trunk/neo/tests/client/testMasterHandler.py
==============================================================================
--- trunk/neo/tests/client/testMasterHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/client/testMasterHandler.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -37,6 +37,7 @@ class MasterHandlerTests(NeoUnitTestBase
class MasterBootstrapHandlerTests(MasterHandlerTests):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.app = Mock()
self.handler = PrimaryBootstrapHandler(self.app)
@@ -136,6 +137,7 @@ class MasterBootstrapHandlerTests(Master
class MasterNotificationsHandlerTests(MasterHandlerTests):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.db = Mock()
self.app = Mock({'getDB': self.db})
self.app.nm = Mock()
@@ -221,6 +223,7 @@ class MasterNotificationsHandlerTests(Ma
class MasterAnswersHandlerTests(MasterHandlerTests):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.app = Mock()
self.handler = PrimaryAnswersHandler(self.app)
Modified: trunk/neo/tests/client/testStorageHandler.py
==============================================================================
--- trunk/neo/tests/client/testStorageHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/client/testStorageHandler.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -30,6 +30,7 @@ MARKER = []
class StorageBootstrapHandlerTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.app = Mock()
self.handler = StorageBootstrapHandler(self.app)
@@ -67,6 +68,7 @@ class StorageBootstrapHandlerTests(NeoUn
class StorageAnswerHandlerTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.app = Mock()
self.app.local_var = Mock()
self.handler = StorageAnswersHandler(self.app)
Modified: trunk/neo/tests/functional/testClient.py
==============================================================================
--- trunk/neo/tests/functional/testClient.py [iso-8859-1] (original)
+++ trunk/neo/tests/functional/testClient.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -76,6 +76,7 @@ class ClientTests(NEOFunctionalTest):
def tearDown(self):
if self.neo is not None:
self.neo.stop()
+ NEOFunctionalTest.tearDown(self)
def __setup(self):
# start cluster
Modified: trunk/neo/tests/functional/testCluster.py
==============================================================================
--- trunk/neo/tests/functional/testCluster.py [iso-8859-1] (original)
+++ trunk/neo/tests/functional/testCluster.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -30,6 +30,7 @@ class ClusterTests(NEOFunctionalTest):
def tearDown(self):
if self.neo is not None:
self.neo.stop()
+ NEOFunctionalTest.tearDown(self)
def testClusterBreaks(self):
self.neo = NEOCluster(['test_neo1'],
Modified: trunk/neo/tests/functional/testMaster.py
==============================================================================
--- trunk/neo/tests/functional/testMaster.py [iso-8859-1] (original)
+++ trunk/neo/tests/functional/testMaster.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -35,6 +35,7 @@ class MasterTests(NEOFunctionalTest):
def tearDown(self):
self.neo.stop()
+ NEOFunctionalTest.tearDown(self)
def testStoppingSecondaryMaster(self):
# Wait for masters to stabilize
Modified: trunk/neo/tests/functional/testStorage.py
==============================================================================
--- trunk/neo/tests/functional/testStorage.py [iso-8859-1] (original)
+++ trunk/neo/tests/functional/testStorage.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -39,6 +39,7 @@ class StorageTests(NEOFunctionalTest):
def tearDown(self):
if self.neo is not None:
self.neo.stop()
+ NEOFunctionalTest.tearDown(self)
def queryCount(self, db, query):
db.query(query)
Modified: trunk/neo/tests/master/testClientHandler.py
==============================================================================
--- trunk/neo/tests/master/testClientHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/master/testClientHandler.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -26,6 +26,7 @@ from neo.master.app import Application
class MasterClientHandlerTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
# create an application object
config = self.getMasterConfiguration(master_number=1, replicas=1)
self.app = Application(config)
Modified: trunk/neo/tests/master/testElectionHandler.py
==============================================================================
--- trunk/neo/tests/master/testElectionHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/master/testElectionHandler.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -34,6 +34,7 @@ def _addPacket(self, packet):
class MasterClientElectionTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
# create an application object
config = self.getMasterConfiguration(master_number=1)
self.app = Application(config)
@@ -192,6 +193,7 @@ class MasterClientElectionTests(NeoUnitT
class MasterServerElectionTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
# create an application object
config = self.getMasterConfiguration(master_number=1)
self.app = Application(config)
Modified: trunk/neo/tests/master/testMasterApp.py
==============================================================================
--- trunk/neo/tests/master/testMasterApp.py [iso-8859-1] (original)
+++ trunk/neo/tests/master/testMasterApp.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -24,6 +24,7 @@ from neo.util import p64, u64
class MasterAppTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
# create an application object
config = self.getMasterConfiguration()
self.app = Application(config)
Modified: trunk/neo/tests/master/testRecovery.py
==============================================================================
--- trunk/neo/tests/master/testRecovery.py [iso-8859-1] (original)
+++ trunk/neo/tests/master/testRecovery.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -25,6 +25,7 @@ from neo.master.app import Application
class MasterRecoveryTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
# create an application object
config = self.getMasterConfiguration()
self.app = Application(config)
Modified: trunk/neo/tests/master/testStorageHandler.py
==============================================================================
--- trunk/neo/tests/master/testStorageHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/master/testStorageHandler.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -28,6 +28,7 @@ from neo.exception import OperationFailu
class MasterStorageHandlerTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
# create an application object
config = self.getMasterConfiguration(master_number=1, replicas=1)
self.app = Application(config)
Modified: trunk/neo/tests/master/testVerification.py
==============================================================================
--- trunk/neo/tests/master/testVerification.py [iso-8859-1] (original)
+++ trunk/neo/tests/master/testVerification.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -26,6 +26,7 @@ from neo.master.app import Application
class MasterVerificationTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
# create an application object
config = self.getMasterConfiguration()
self.app = Application(config)
Modified: trunk/neo/tests/storage/testClientHandler.py
==============================================================================
--- trunk/neo/tests/storage/testClientHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testClientHandler.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -36,6 +36,7 @@ class StorageClientHandlerTests(NeoUnitT
self.checkUnexpectedPacketRaised(_call, conn=conn, **kwargs)
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.prepareDatabase(number=1)
# create an application object
config = self.getStorageConfiguration(master_number=1)
Modified: trunk/neo/tests/storage/testIdentificationHandler.py
==============================================================================
--- trunk/neo/tests/storage/testIdentificationHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testIdentificationHandler.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -26,6 +26,7 @@ from neo.storage.handlers.identification
class StorageIdentificationHandlerTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
config = self.getStorageConfiguration(master_number=1)
self.app = Application(config)
self.app.name = 'NEO'
Modified: trunk/neo/tests/storage/testInitializationHandler.py
==============================================================================
--- trunk/neo/tests/storage/testInitializationHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testInitializationHandler.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -27,6 +27,7 @@ from neo.exception import PrimaryFailure
class StorageInitializationHandlerTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.prepareDatabase(number=1)
# create an application object
config = self.getStorageConfiguration(master_number=1)
Modified: trunk/neo/tests/storage/testMasterHandler.py
==============================================================================
--- trunk/neo/tests/storage/testMasterHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testMasterHandler.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -35,6 +35,7 @@ class StorageMasterHandlerTests(NeoUnitT
self.checkUnexpectedPacketRaised(_call, conn=conn, **kwargs)
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.prepareDatabase(number=1)
# create an application object
config = self.getStorageConfiguration(master_number=1)
Modified: trunk/neo/tests/storage/testStorageApp.py
==============================================================================
--- trunk/neo/tests/storage/testStorageApp.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testStorageApp.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -27,6 +27,7 @@ from neo.util import dump
class StorageAppTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.prepareDatabase(number=1)
# create an application object
config = self.getStorageConfiguration(master_number=1)
Modified: trunk/neo/tests/storage/testStorageHandler.py
==============================================================================
--- trunk/neo/tests/storage/testStorageHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testStorageHandler.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -34,6 +34,7 @@ class StorageStorageHandlerTests(NeoUnit
self.checkUnexpectedPacketRaised(_call, conn=conn, **kwargs)
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.prepareDatabase(number=1)
# create an application object
config = self.getStorageConfiguration(master_number=1)
Modified: trunk/neo/tests/storage/testStorageMySQLdb.py
==============================================================================
--- trunk/neo/tests/storage/testStorageMySQLdb.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testStorageMySQLdb.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -30,6 +30,7 @@ NEO_SQL_USER = 'test'
class StorageMySQSLdbTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.prepareDatabase(number=1, prefix=NEO_SQL_DATABASE[:-1])
# db manager
database = '%s@%s' % (NEO_SQL_USER, NEO_SQL_DATABASE)
@@ -39,6 +40,7 @@ class StorageMySQSLdbTests(NeoUnitTestBa
def tearDown(self):
self.db.close()
+ NeoUnitTestBase.tearDown(self)
def checkCalledQuery(self, query=None, call=0):
self.assertTrue(len(self.db.conn.mockGetNamedCalls('query')) > call)
Modified: trunk/neo/tests/storage/testTransactions.py
==============================================================================
--- trunk/neo/tests/storage/testTransactions.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testTransactions.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -82,6 +82,7 @@ class TransactionTests(NeoUnitTestBase):
class TransactionManagerTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.app = Mock()
# no history
self.app.dm = Mock({'getObjectHistory': []})
Modified: trunk/neo/tests/storage/testVerificationHandler.py
==============================================================================
--- trunk/neo/tests/storage/testVerificationHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testVerificationHandler.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -29,6 +29,7 @@ from neo.util import p64, u64
class StorageVerificationHandlerTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.prepareDatabase(number=1)
# create an application object
config = self.getStorageConfiguration(master_number=1)
Modified: trunk/neo/tests/testBootstrap.py
==============================================================================
--- trunk/neo/tests/testBootstrap.py [iso-8859-1] (original)
+++ trunk/neo/tests/testBootstrap.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -25,6 +25,7 @@ from neo.protocol import NodeTypes
class BootstrapManagerTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.prepareDatabase(number=1)
# create an application object
config = self.getStorageConfiguration()
Modified: trunk/neo/tests/testConnection.py
==============================================================================
--- trunk/neo/tests/testConnection.py [iso-8859-1] (original)
+++ trunk/neo/tests/testConnection.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -32,6 +32,7 @@ from neo.locking import Queue
class ConnectionTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.app = Mock({'__repr__': 'Fake App'})
self.em = Mock({'__repr__': 'Fake Em'})
self.handler = Mock({'__repr__': 'Fake Handler'})
@@ -834,6 +835,7 @@ class MTConnectionTests(ConnectionTests)
class HandlerSwitcherTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self._handler = handler = Mock({
'__repr__': 'initial handler',
})
@@ -1087,6 +1089,7 @@ class HandlerSwitcherTests(NeoUnitTestBa
class TestTimeout(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.current = time()
self.timeout = Timeout()
self._updateAt(0)
Modified: trunk/neo/tests/testHandler.py
==============================================================================
--- trunk/neo/tests/testHandler.py [iso-8859-1] (original)
+++ trunk/neo/tests/testHandler.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -25,6 +25,7 @@ from neo.protocol import PacketMalformed
class HandlerTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
app = Mock()
self.handler = EventHandler(app)
self.fake_type = 'FAKE_PACKET_TYPE'
Modified: trunk/neo/tests/testNodes.py
==============================================================================
--- trunk/neo/tests/testNodes.py [iso-8859-1] (original)
+++ trunk/neo/tests/testNodes.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -27,6 +27,7 @@ from time import time
class NodesTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.manager = Mock()
def _updatedByAddress(self, node, index=0):
@@ -125,6 +126,7 @@ class NodesTests(NeoUnitTestBase):
class NodeManagerTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.manager = NodeManager()
def _addStorage(self):
Modified: trunk/neo/tests/testProtocol.py
==============================================================================
--- trunk/neo/tests/testProtocol.py [iso-8859-1] (original)
+++ trunk/neo/tests/testProtocol.py [iso-8859-1] Tue Nov 2 11:16:55 2010
@@ -24,6 +24,7 @@ from neo.tests import NeoUnitTestBase
class ProtocolTests(NeoUnitTestBase):
def setUp(self):
+ NeoUnitTestBase.setUp(self)
self.ltid = None
def getNextTID(self):
More information about the Neo-report
mailing list