Commit 371ae1f5 authored by Grégory Wisniewski's avatar Grégory Wisniewski

Update tests to follow changes introduced wiith commit #1032 and avoid crash

many tests.


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@1063 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent e3392cd7
......@@ -37,7 +37,7 @@ class ClientHandlerTests(NeoTestBase):
def setUp(self):
# Silence all log messages
logging.basicConfig(level=logging.CRITICAL + 1)
pass
def getConnection(self, uuid=None, port=10010, next_id=None, ip='127.0.0.1'):
if uuid is None:
......
......@@ -40,7 +40,6 @@ from neo.node import MasterNode, StorageNode
class MasterClientHandlerTests(NeoTestBase):
def setUp(self):
logging.basicConfig(level = logging.WARNING)
# create an application object
config = self.getConfigFile(master_number=1, replicas=1)
self.app = Application(config, "master1")
......
......@@ -64,7 +64,6 @@ def expectMessage(self, packet):
class MasterClientElectionTests(NeoTestBase):
def setUp(self):
logging.basicConfig(level = logging.WARNING)
# create an application object
config = self.getConfigFile()
self.app = Application(config, "master1")
......@@ -133,7 +132,6 @@ class MasterClientElectionTests(NeoTestBase):
class MasterServerElectionTests(NeoTestBase):
def setUp(self):
logging.basicConfig(level = logging.WARNING)
# create an application object
config = self.getConfigFile()
self.app = Application(config, "master1")
......
......@@ -27,7 +27,6 @@ from neo.storage.mysqldb import p64, u64
class MasterAppTests(NeoTestBase):
def setUp(self):
logging.basicConfig(level = logging.WARNING)
# create an application object
config = self.getConfigFile()
self.app = Application(config, "master1")
......
......@@ -54,7 +54,6 @@ from neo.connection import ClientConnection
class MasterRecoveryTests(NeoTestBase):
def setUp(self):
logging.basicConfig(level = logging.WARNING)
# create an application object
config = self.getConfigFile()
self.app = Application(config, "master1")
......
......@@ -40,7 +40,6 @@ from neo.node import MasterNode, StorageNode
class MasterStorageHandlerTests(NeoTestBase):
def setUp(self):
logging.basicConfig(level = logging.WARNING)
# create an application object
config = self.getConfigFile(master_number=1, replicas=1)
self.app = Application(config, "master1")
......
......@@ -42,7 +42,6 @@ from neo.connection import ClientConnection
class MasterVerificationTests(NeoTestBase):
def setUp(self):
logging.basicConfig(level = logging.WARNING)
# create an application object
config = self.getConfigFile(master_number=2)
self.app = Application(config, "master1")
......
......@@ -44,7 +44,6 @@ class StorageClientHandlerTests(NeoTestBase):
self.checkUnexpectedPacketRaised(_call, conn=conn, packet=packet, **kwargs)
def setUp(self):
logging.basicConfig(level = logging.ERROR)
self.prepareDatabase(number=1)
# create an application object
config = self.getConfigFile(master_number=1)
......
......@@ -41,7 +41,6 @@ from neo.storage.mysqldb import MySQLDatabaseManager, p64, u64
class StorageInitializationHandlerTests(NeoTestBase):
def setUp(self):
logging.basicConfig(level = logging.ERROR)
self.prepareDatabase(number=1)
# create an application object
config = self.getConfigFile(master_number=1)
......
......@@ -43,7 +43,6 @@ class StorageMasterHandlerTests(NeoTestBase):
self.checkUnexpectedPacketRaised(_call, conn=conn, packet=packet, **kwargs)
def setUp(self):
logging.basicConfig(level = logging.ERROR)
self.prepareDatabase(number=1)
# create an application object
config = self.getConfigFile(master_number=1)
......
......@@ -29,7 +29,6 @@ from neo.pt import PartitionTable
class StorageAppTests(NeoTestBase):
def setUp(self):
logging.basicConfig(level = logging.WARNING)
self.prepareDatabase(number=1)
# create an application object
config = self.getConfigFile(master_number=1)
......
......@@ -41,7 +41,6 @@ class StorageStorageHandlerTests(NeoTestBase):
self.checkUnexpectedPacketRaised(_call, conn=conn, packet=packet, **kwargs)
def setUp(self):
logging.basicConfig(level = logging.ERROR)
self.prepareDatabase(number=1)
# create an application object
config = self.getConfigFile(master_number=1)
......
......@@ -31,7 +31,6 @@ NEO_SQL_USER = 'test'
class StorageMySQSLdbTests(NeoTestBase):
def setUp(self):
logging.basicConfig(level = logging.ERROR)
self.prepareDatabase(number=1, prefix=NEO_SQL_DATABASE[:-1])
# db manager
self.db = MySQLDatabaseManager(
......
......@@ -41,7 +41,6 @@ from neo.storage.mysqldb import MySQLDatabaseManager, p64, u64
class StorageVerificationHandlerTests(NeoTestBase):
def setUp(self):
logging.basicConfig(level = logging.ERROR)
self.prepareDatabase(number=1)
# create an application object
config = self.getConfigFile(master_number=1)
......
......@@ -34,7 +34,6 @@ from neo.protocol import ANSWER_PRIMARY_MASTER
class BootstrapManagerTests(NeoTestBase):
def setUp(self):
logging.basicConfig(level = logging.ERROR)
self.prepareDatabase(number=1)
# create an application object
config = self.getConfigFile()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment