Master and storage tests now inherit from neo.tests.base.NeoTestBase.

Duplicate checks removed and unified. 


git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@520 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/master/tests/testMasterElectionHandler.py

@@ -21,6 +21,7 @@ import logging
 from tempfile import mkstemp
 from mock import Mock
 from struct import pack, unpack
+from neo.tests.base import NeoTestBase
 from neo import protocol
 from neo.protocol import Packet, INVALID_UUID
 from neo.master.election import ElectionEventHandler
@@ -64,7 +65,7 @@ ClientConnection._addPacket = _addPacket
 ClientConnection.expectMessage = expectMessage
 
 
-class MasterElectionTests(unittest.TestCase):
+class MasterElectionTests(NeoTestBase):
 
     def setUp(self):
         logging.basicConfig(level = logging.WARNING)
@@ -134,35 +135,6 @@ server: 127.0.0.1:10023
         # Delete tmp file
         os.remove(self.tmp_path)
 
-    def checkProtocolErrorRaised(self, method, *args, **kwargs):
-        """ Check if the ProtocolError exception was raised """
-        self.assertRaises(protocol.ProtocolError, method, *args, **kwargs)
-
-    def checkUnexpectedPacketRaised(self, method, *args, **kwargs):
-        """ Check if the UnexpectedPacketError exception wxas raised """
-        self.assertRaises(protocol.UnexpectedPacketError, method, *args, **kwargs)
-
-    def checkIdenficationRequired(self, method, *args, **kwargs):
-        """ Check is the identification_required decorator is applied """
-        self.checkUnexpectedPacketRaised(method, *args, **kwargs)
-
-    def checkBrokenNodeDisallowedErrorRaised(self, method, *args, **kwargs):
-        """ Check if the BrokenNodeDisallowedError exception wxas raised """
-        self.assertRaises(protocol.BrokenNodeDisallowedError, method, *args, **kwargs)
-
-    def checkNotReadyErrorRaised(self, method, *args, **kwargs):
-        """ Check if the NotReadyError exception wxas raised """
-        self.assertRaises(protocol.NotReadyError, method, *args, **kwargs)
-
-    def checkCalledAcceptNodeIdentification(self, conn, packet_number=0):
-        """ Check Accept Node Identification has been send"""
-        self.assertEquals(len(conn.mockGetNamedCalls("answer")), 1)
-        self.assertEquals(len(conn.mockGetNamedCalls("abort")), 0)
-        call = conn.mockGetNamedCalls("answer")[packet_number]
-        packet = call.getParam(0)
-        self.assertTrue(isinstance(packet, Packet))
-        self.assertEquals(packet.getType(), ACCEPT_NODE_IDENTIFICATION)
-
     # Common methods
     def getNewUUID(self):
         uuid = INVALID_UUID
@@ -191,7 +163,7 @@ server: 127.0.0.1:10023
                                                 ip_address=ip,
                                                 port=port,
                                                 name=self.app.name,)
-        self.checkCalledAcceptNodeIdentification(conn)
+        self.checkAcceptNodeIdentification(conn, packet)
         return uuid
 
     # Method to test the kind of packet returned in answer
@@ -549,7 +521,7 @@ server: 127.0.0.1:10023
         self.assertEqual(len(self.app.nm.getMasterNodeList()), 1)
         self.assertEqual(node.getUUID(), uuid)
         self.assertEqual(node.getState(), RUNNING_STATE)
-        self.checkCalledAcceptNodeIdentification(conn)
+        self.checkAcceptNodeIdentification(conn, packet)
         # unknown node
         conn = Mock({"_addPacket" : None, "abort" : None, "expectMessage" : None,
                     "isServerConnection" : True})
@@ -565,7 +537,7 @@ server: 127.0.0.1:10023
                                                 port=self.master_port+1,
                                                 name=self.app.name,)
         self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
-        self.checkCalledAcceptNodeIdentification(conn)
+        self.checkAcceptNodeIdentification(conn, packet)
         self.assertEqual(len(self.app.unconnected_master_node_set), 2)
         self.assertEqual(len(self.app.negotiating_master_node_set), 0)
         # broken node

neo/master/tests/testMasterRecoveryHandler.py

@@ -21,6 +21,7 @@ import logging
 from tempfile import mkstemp
 from mock import Mock
 from struct import pack, unpack
+from neo.tests.base import NeoTestBase
 from neo import protocol
 from neo.protocol import Packet, INVALID_UUID
 from neo.master.recovery import RecoveryEventHandler
@@ -51,7 +52,7 @@ from neo.node import MasterNode, StorageNode
 from neo.master.tests.connector import DoNothingConnector
 from neo.connection import ClientConnection
 
-class MasterRecoveryTests(unittest.TestCase):
+class MasterRecoveryTests(NeoTestBase):
 
     def setUp(self):
         logging.basicConfig(level = logging.WARNING)
@@ -121,13 +122,6 @@ server: 127.0.0.1:10023
         os.remove(self.tmp_path)
 
     # Common methods
-    def getNewUUID(self):
-        uuid = INVALID_UUID
-        while uuid == INVALID_UUID:
-            uuid = os.urandom(16)
-        self.uuid = uuid
-        return uuid
-
     def getLastUUID(self):
         return self.uuid
 
@@ -141,38 +135,9 @@ server: 127.0.0.1:10023
         # test alien cluster
         conn = Mock({"_addPacket" : None, "abort" : None, "expectMessage" : None})
         self.recovery.handleRequestNodeIdentification(conn, packet, *args)
-        self.checkCalledAcceptNodeIdentification(conn)
+        self.checkAcceptNodeIdentification(conn)
         return uuid
 
-    def checkProtocolErrorRaised(self, method, *args, **kwargs):
-        """ Check if the ProtocolError exception was raised """
-        self.assertRaises(protocol.ProtocolError, method, *args, **kwargs)
-
-    def checkUnexpectedPacketRaised(self, method, *args, **kwargs):
-        """ Check if the UnexpectedPacketError exception wxas raised """
-        self.assertRaises(protocol.UnexpectedPacketError, method, *args, **kwargs)
-
-    def checkIdenficationRequired(self, method, *args, **kwargs):
-        """ Check is the identification_required decorator is applied """
-        self.checkUnexpectedPacketRaised(method, *args, **kwargs)
-
-    def checkBrokenNodeDisallowedErrorRaised(self, method, *args, **kwargs):
-        """ Check if the BrokenNodeDisallowedError exception wxas raised """
-        self.assertRaises(protocol.BrokenNodeDisallowedError, method, *args, **kwargs)
-
-    def checkNotReadyErrorRaised(self, method, *args, **kwargs):
-        """ Check if the NotReadyError exception wxas raised """
-        self.assertRaises(protocol.NotReadyError, method, *args, **kwargs)
-
-    def checkCalledAcceptNodeIdentification(self, conn, packet_number=0):
-        """ Check Accept Node Identification has been send"""
-        self.assertEquals(len(conn.mockGetNamedCalls("answer")), 1)
-        self.assertEquals(len(conn.mockGetNamedCalls("abort")), 0)
-        call = conn.mockGetNamedCalls("answer")[packet_number]
-        packet = call.getParam(0)
-        self.assertTrue(isinstance(packet, Packet))
-        self.assertEquals(packet.getType(), ACCEPT_NODE_IDENTIFICATION)
-
     # Method to test the kind of packet returned in answer
     def checkCalledRequestNodeIdentification(self, conn, packet_number=0):
         """ Check Request Node Identification has been send"""
@@ -322,7 +287,7 @@ server: 127.0.0.1:10023
         self.assertEqual(len(self.app.nm.getMasterNodeList()), 1)
         self.assertEqual(node.getUUID(), uuid)
         self.assertEqual(node.getState(), RUNNING_STATE)
-        self.checkCalledAcceptNodeIdentification(conn)
+        self.checkAcceptNodeIdentification(conn)
 
         # 3. unknown master node with known address but different uuid, will be replaced
         old_uuid = uuid
@@ -375,7 +340,7 @@ server: 127.0.0.1:10023
         self.assertEqual(len(self.app.nm.getMasterNodeList()), 1)
         self.assertEqual(node.getUUID(), uuid)
         self.assertEqual(node.getState(), RUNNING_STATE)
-        self.checkCalledAcceptNodeIdentification(conn)
+        self.checkAcceptNodeIdentification(conn)
         known_uuid = uuid
 
         # 5. known by uuid, but different address -> conflict / new master
@@ -401,7 +366,7 @@ server: 127.0.0.1:10023
         self.assertEqual(node.getUUID(), uuid)
         self.assertEqual(node.getState(), RUNNING_STATE)
         self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
-        self.checkCalledAcceptNodeIdentification(conn)
+        self.checkAcceptNodeIdentification(conn)
         # a new uuid is sent
         call = conn.mockGetNamedCalls('answer')[0]
         body = call.getParam(0)._body
@@ -482,7 +447,7 @@ server: 127.0.0.1:10023
         self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
         self.assertEqual(node.getUUID(), uuid)
         self.assertEqual(node.getState(), RUNNING_STATE)
-        self.checkCalledAcceptNodeIdentification(conn)
+        self.checkAcceptNodeIdentification(conn)
 
         # 9. New node
         uuid = self.getNewUUID()
@@ -506,7 +471,7 @@ server: 127.0.0.1:10023
         self.assertEqual(len(self.app.nm.getMasterNodeList()), 3)
         self.assertEqual(node.getUUID(), uuid)
         self.assertEqual(node.getState(), RUNNING_STATE)
-        self.checkCalledAcceptNodeIdentification(conn)
+        self.checkAcceptNodeIdentification(conn)
         
 
     def test_05_handleAskPrimaryMaster(self):

neo/master/tests/testMasterVerificationHandler.py

@@ -21,6 +21,7 @@ import logging
 from tempfile import mkstemp
 from mock import Mock
 from struct import pack, unpack
+from neo.tests.base import NeoTestBase
 from neo.protocol import Packet, INVALID_UUID
 from neo.master.verification import VerificationEventHandler
 from neo.master.app import Application
@@ -52,7 +53,7 @@ from neo.master.tests.connector import DoNothingConnector
 from neo.connection import ClientConnection
 
 
-class MasterVerificationeTests(unittest.TestCase):
+class MasterVerificationeTests(NeoTestBase):
 
     def setUp(self):
         logging.basicConfig(level = logging.WARNING)
@@ -123,43 +124,7 @@ server: 127.0.0.1:10023
         # Delete tmp file
         os.remove(self.tmp_path)
 
-    def checkProtocolErrorRaised(self, method, *args, **kwargs):
-        """ Check if the ProtocolError exception was raised """
-        self.assertRaises(protocol.ProtocolError, method, *args, **kwargs)
-
-    def checkUnexpectedPacketRaised(self, method, *args, **kwargs):
-        """ Check if the UnexpectedPacketError exception wxas raised """
-        self.assertRaises(protocol.UnexpectedPacketError, method, *args, **kwargs)
-
-    def checkIdenficationRequired(self, method, *args, **kwargs):
-        """ Check is the identification_required decorator is applied """
-        self.checkUnexpectedPacketRaised(method, *args, **kwargs)
-
-    def checkBrokenNodeDisallowedErrorRaised(self, method, *args, **kwargs):
-        """ Check if the BrokenNodeDisallowedError exception wxas raised """
-        self.assertRaises(protocol.BrokenNodeDisallowedError, method, *args, **kwargs)
-
-    def checkNotReadyErrorRaised(self, method, *args, **kwargs):
-        """ Check if the NotReadyError exception wxas raised """
-        self.assertRaises(protocol.NotReadyError, method, *args, **kwargs)
-
-    def checkCalledAcceptNodeIdentification(self, conn, packet_number=0):
-        """ Check Accept Node Identification has been send"""
-        self.assertEquals(len(conn.mockGetNamedCalls("answer")), 1)
-        self.assertEquals(len(conn.mockGetNamedCalls("abort")), 0)
-        call = conn.mockGetNamedCalls("answer")[packet_number]
-        packet = call.getParam(0)
-        self.assertTrue(isinstance(packet, Packet))
-        self.assertEquals(packet.getType(), ACCEPT_NODE_IDENTIFICATION)
-
     # Common methods
-    def getNewUUID(self):
-        uuid = INVALID_UUID
-        while uuid == INVALID_UUID:
-            uuid = os.urandom(16)
-        self.uuid = uuid
-        return uuid
-
     def getLastUUID(self):
         return self.uuid
 
@@ -173,7 +138,7 @@ server: 127.0.0.1:10023
         # test alien cluster
         conn = Mock({"_addPacket" : None, "abort" : None, "expectMessage" : None})
         self.verification.handleRequestNodeIdentification(conn, packet, *args)
-        self.checkCalledAcceptNodeIdentification(conn)
+        self.checkAcceptNodeIdentification(conn)
         return uuid
 
     # Method to test the kind of packet returned in answer
@@ -344,7 +309,7 @@ server: 127.0.0.1:10023
         self.assertEqual(len(self.app.nm.getMasterNodeList()), 1)
         self.assertEqual(node.getUUID(), uuid)
         self.assertEqual(node.getState(), RUNNING_STATE)
-        self.checkCalledAcceptNodeIdentification(conn)
+        self.checkAcceptNodeIdentification(conn)
 
         # 3. unknown master node with known address but different uuid, will be replaced
         old_uuid = uuid
@@ -397,7 +362,7 @@ server: 127.0.0.1:10023
         self.assertEqual(len(self.app.nm.getMasterNodeList()), 1)
         self.assertEqual(node.getUUID(), uuid)
         self.assertEqual(node.getState(), RUNNING_STATE)
-        self.checkCalledAcceptNodeIdentification(conn)
+        self.checkAcceptNodeIdentification(conn)
 
         # 5. known by uuid, but different address
         conn = Mock({"_addPacket" : None,
@@ -422,7 +387,7 @@ server: 127.0.0.1:10023
         self.assertEqual(node.getUUID(), uuid)
         self.assertEqual(node.getState(), RUNNING_STATE)
         self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
-        self.checkCalledAcceptNodeIdentification(conn)
+        self.checkAcceptNodeIdentification(conn)
         # a new uuid is sent
         call = conn.mockGetNamedCalls('answer')[0]
         body = call.getParam(0)._body
@@ -503,7 +468,7 @@ server: 127.0.0.1:10023
         self.assertEqual(len(self.app.nm.getMasterNodeList()), 2)
         self.assertEqual(node.getUUID(), uuid)
         self.assertEqual(node.getState(), RUNNING_STATE)
-        self.checkCalledAcceptNodeIdentification(conn)
+        self.checkAcceptNodeIdentification(conn)
 
         # 9. New node
         uuid = self.getNewUUID()
@@ -527,7 +492,7 @@ server: 127.0.0.1:10023
         self.assertEqual(len(self.app.nm.getMasterNodeList()), 3)
         self.assertEqual(node.getUUID(), uuid)
         self.assertEqual(node.getState(), RUNNING_STATE)
-        self.checkCalledAcceptNodeIdentification(conn)
+        self.checkAcceptNodeIdentification(conn)
         
 
     def test_05_handleAskPrimaryMaster(self):

neo/storage/tests/testStorageBootstrapHandler.py

@@ -21,6 +21,7 @@ import logging
 import MySQLdb
 from tempfile import mkstemp
 from mock import Mock
+from neo.tests.base import NeoTestBase
 from neo.master.app import MasterNode
 from neo.pt import PartitionTable
 from neo.storage.app import Application, StorageNode
@@ -38,7 +39,7 @@ SQL_ADMIN_PASSWORD = None
 NEO_SQL_USER = 'test'
 NEO_SQL_DATABASE = 'test_storage_neo1'
 
-class StorageBootstrapTests(unittest.TestCase):
+class StorageBootstrapTests(NeoTestBase):
 
     def setUp(self):
         logging.basicConfig(level = logging.ERROR)
@@ -100,56 +101,15 @@ server: 127.0.0.1:10020
         os.remove(self.tmp_path)
 
     # Common methods
-    def getNewUUID(self):
-        uuid = INVALID_UUID
-        while uuid == INVALID_UUID:
-            uuid = os.urandom(16)
-        self.uuid = uuid
-        return uuid
-
     def getLastUUID(self):
         return self.uuid
 
-    def checkProtocolErrorRaised(self, method, *args, **kwargs):
-        """ Check if the ProtocolError exception was raised """
-        self.assertRaises(protocol.ProtocolError, method, *args, **kwargs)
-
-    def checkUnexpectedPacketRaised(self, method, *args, **kwargs):
-        """ Check if the UnexpectedPacketError exception wxas raised """
-        self.assertRaises(protocol.UnexpectedPacketError, method, *args, **kwargs)
-
-    def checkIdenficationRequired(self, method, *args, **kwargs):
-        """ Check is the identification_required decorator is applied """
-        self.checkUnexpectedPacketRaised(method, *args, **kwargs)
-
-    def checkBrokenNodeDisallowedErrorRaised(self, method, *args, **kwargs):
-        """ Check if the BrokenNodeDisallowedError exception wxas raised """
-        self.assertRaises(protocol.BrokenNodeDisallowedError, method, *args, **kwargs)
-
-    def checkNotReadyErrorRaised(self, method, *args, **kwargs):
-        """ Check if the NotReadyError exception wxas raised """
-        self.assertRaises(protocol.NotReadyError, method, *args, **kwargs)
-
-    def checkAskPacket(self, conn, packet_type):
-        """ Check if an ask-packet with the right type is send """
-        calls = conn.mockGetNamedCalls('ask')
-        self.assertEquals(len(calls), 1)
-        packet = calls[0].getParam(0)
-        self.assertTrue(isinstance(packet, Packet))
-        self.assertEquals(packet.getType(), packet_type)
-
     # Method to test the kind of packet returned in answer
     def checkCalledRequestNodeIdentification(self, conn, packet_number=0):
         """ Check Request Node Identification has been send"""
         self.assertEquals(len(conn.mockGetNamedCalls("abort")), 0)
         self.checkAskPacket(conn, protocol.REQUEST_NODE_IDENTIFICATION)
 
-    def checkNoPacketSent(self, conn):
-        # no packet should be sent
-        self.assertEquals(len(conn.mockGetNamedCalls('notify')), 0)
-        self.assertEquals(len(conn.mockGetNamedCalls('answer')), 0)
-        self.assertEquals(len(conn.mockGetNamedCalls('ask')), 0)
-
     # Tests
     def test_01_connectionCompleted(self):
         # trying mn is None -> RuntimeError

neo/storage/tests/testStorageOperation.py

@@ -23,6 +23,7 @@ from tempfile import mkstemp
 from struct import pack, unpack
 from mock import Mock
 from collections import deque
+from neo.tests.base import NeoTestBase
 from neo.master.app import MasterNode
 from neo.storage.app import Application, StorageNode
 from neo.storage.operation import TransactionInformation, OperationEventHandler
@@ -36,41 +37,9 @@ SQL_ADMIN_PASSWORD = None
 NEO_SQL_USER = 'test'
 NEO_SQL_DATABASE = 'test_storage_neo1'
 
-class StorageOperationTests(unittest.TestCase):
-
-    def getNewUUID(self):
-        uuid = INVALID_UUID
-        while uuid == INVALID_UUID:
-            uuid = os.urandom(16)
-        self.uuid = uuid
-        return uuid
-
-    def getTwoIDs(self):
-        # generate two ptid, first is lower
-        ptids = self.getNewUUID(), self.getNewUUID()
-        return min(ptids), max(ptids)
-        ptid = min(ptids)
-
-    def checkProtocolErrorRaised(self, method, *args, **kwargs):
-        """ Check if the ProtocolError exception was raised """
-        self.assertRaises(protocol.ProtocolError, method, *args, **kwargs)
-
-    def checkUnexpectedPacketRaised(self, method, *args, **kwargs):
-        """ Check if the UnexpectedPacketError exception wxas raised """
-        self.assertRaises(protocol.UnexpectedPacketError, method, *args, **kwargs)
-
-    def checkIdenficationRequired(self, method, *args, **kwargs):
-        """ Check is the identification_required decorator is applied """
-        self.checkUnexpectedPacketRaised(method, *args, **kwargs)
-
-    def checkBrokenNodeDisallowedErrorRaised(self, method, *args, **kwargs):
-        """ Check if the BrokenNodeDisallowedError exception wxas raised """
-        self.assertRaises(protocol.BrokenNodeDisallowedError, method, *args, **kwargs)
-
-    def checkNotReadyErrorRaised(self, method, *args, **kwargs):
-        """ Check if the NotReadyError exception wxas raised """
-        self.assertRaises(protocol.NotReadyError, method, *args, **kwargs)
+class StorageOperationTests(NeoTestBase):
 
+    # TODO: move this check to base class and rename as checkAnswerPacket
     def checkPacket(self, conn, packet_type=ERROR):
         self.assertEquals(len(conn.mockGetNamedCalls("answer")), 1)
         call = conn.mockGetNamedCalls("answer")[0]
@@ -88,12 +57,6 @@ class StorageOperationTests(unittest.TestCase):
         self.operation.peerBroken = lambda c: c.peerBrokendCalled()
         self.checkUnexpectedPacketRaised(_call, conn=conn, packet=packet, **kwargs)
 
-    def checkNoPacketSent(self, conn):
-        # no packet should be sent
-        self.assertEquals(len(conn.mockGetNamedCalls('notify')), 0)
-        self.assertEquals(len(conn.mockGetNamedCalls('answer')), 0)
-        self.assertEquals(len(conn.mockGetNamedCalls('ask')), 0)
-
     def setUp(self):
         logging.basicConfig(level = logging.ERROR)
         # create an application object

neo/storage/tests/testStorageVerificationHandler.py

@@ -21,6 +21,7 @@ import logging
 import MySQLdb
 from tempfile import mkstemp
 from mock import Mock
+from neo.tests.base import NeoTestBase
 from neo import protocol
 from neo.node import MasterNode
 from neo.pt import PartitionTable
@@ -45,7 +46,7 @@ SQL_ADMIN_PASSWORD = None
 NEO_SQL_USER = 'test'
 NEO_SQL_DATABASE = 'test_storage_neo1'
 
-class StorageVerificationTests(unittest.TestCase):
+class StorageVerificationTests(NeoTestBase):
 
     def setUp(self):
         logging.basicConfig(level = logging.ERROR)
@@ -111,48 +112,9 @@ server: 127.0.0.1:10020
         os.remove(self.tmp_path)
 
     # Common methods
-    def getNewUUID(self):
-        uuid = INVALID_UUID
-        while uuid == INVALID_UUID:
-            uuid = os.urandom(16)
-        self.uuid = uuid
-        return uuid
-
     def getLastUUID(self):
         return self.uuid
 
-    def getTwoIDs(self):
-        # generate two ptid, first is lower
-        ptids = self.getNewUUID(), self.getNewUUID()
-        return min(ptids), max(ptids)
-        ptid = min(ptids)
-
-    def checkProtocolErrorRaised(self, method, *args, **kwargs):
-        """ Check if the ProtocolError exception was raised """
-        self.assertRaises(protocol.ProtocolError, method, *args, **kwargs)
-
-    def checkUnexpectedPacketRaised(self, method, *args, **kwargs):
-        """ Check if the UnexpectedPacketError exception wxas raised """
-        self.assertRaises(protocol.UnexpectedPacketError, method, *args, **kwargs)
-
-    def checkIdenficationRequired(self, method, *args, **kwargs):
-        """ Check is the identification_required decorator is applied """
-        self.checkUnexpectedPacketRaised(method, *args, **kwargs)
-
-    def checkBrokenNodeDisallowedErrorRaised(self, method, *args, **kwargs):
-        """ Check if the BrokenNodeDisallowedError exception wxas raised """
-        self.assertRaises(protocol.BrokenNodeDisallowedError, method, *args, **kwargs)
-
-    def checkNotReadyErrorRaised(self, method, *args, **kwargs):
-        """ Check if the NotReadyError exception wxas raised """
-        self.assertRaises(protocol.NotReadyError, method, *args, **kwargs)
-
-    def checkNoPacketSent(self, conn):
-        # no packet should be sent
-        self.assertEquals(len(conn.mockGetNamedCalls('notify')), 0)
-        self.assertEquals(len(conn.mockGetNamedCalls('answer')), 0)
-        self.assertEquals(len(conn.mockGetNamedCalls('ask')), 0)
-
     # Tests
     def test_01_connectionAccepted(self):
         uuid = self.getNewUUID()

neo/tests/base.py

@@ -17,9 +17,132 @@
 
 import unittest, os
 from mock import Mock
+from neo import protocol
 
 class NeoTestBase(unittest.TestCase):
     """ Base class for neo tests, implements common checks """
 
-    pass
+    # XXX: according to changes with namespaced UUIDs, it whould be better to 
+    # implement get<NodeType>UUID() methods 
+    def getNewUUID(self):
+        """ Return a valid UUID """
+        uuid = protocol.INVALID_UUID
+        while uuid == protocol.INVALID_UUID:
+            uuid = os.urandom(16)
+        self.uuid = uuid
+        return uuid
+
+    def getTwoIDs(self):
+        """ Return a tuple of two sorted UUIDs """
+        # generate two ptid, first is lower
+        ptids = self.getNewUUID(), self.getNewUUID()
+        return min(ptids), max(ptids)
+        ptid = min(ptids)
+
+    def checkProtocolErrorRaised(self, method, *args, **kwargs):
+        """ Check if the ProtocolError exception was raised """
+        self.assertRaises(protocol.ProtocolError, method, *args, **kwargs)
+
+    def checkUnexpectedPacketRaised(self, method, *args, **kwargs):
+        """ Check if the UnexpectedPacketError exception wxas raised """
+        self.assertRaises(protocol.UnexpectedPacketError, method, *args, **kwargs)
+
+    def checkIdenficationRequired(self, method, *args, **kwargs):
+        """ Check is the identification_required decorator is applied """
+        self.checkUnexpectedPacketRaised(method, *args, **kwargs)
+
+    def checkBrokenNodeDisallowedErrorRaised(self, method, *args, **kwargs):
+        """ Check if the BrokenNodeDisallowedError exception wxas raised """
+        self.assertRaises(protocol.BrokenNodeDisallowedError, method, *args, **kwargs)
+
+    def checkNotReadyErrorRaised(self, method, *args, **kwargs):
+        """ Check if the NotReadyError exception wxas raised """
+        self.assertRaises(protocol.NotReadyError, method, *args, **kwargs)
+
+    def checkNoPacketSent(self, conn):
+        # no packet should be sent
+        self.assertEquals(len(conn.mockGetNamedCalls('notify')), 0)
+        self.assertEquals(len(conn.mockGetNamedCalls('answer')), 0)
+        self.assertEquals(len(conn.mockGetNamedCalls('ask')), 0)
+
+    # in check(Ask|Answer|Notify)Packet we return the packet so it can be used
+    # in tests if more accurates checks are required
+
+    def checkAskPacket(self, conn, packet_type):
+        """ Check if an ask-packet with the right type is sent """
+        calls = conn.mockGetNamedCalls('ask')
+        self.assertEquals(len(calls), 1)
+        packet = calls[0].getParam(0)
+        self.assertTrue(isinstance(packet, protocol.Packet))
+        self.assertEquals(packet.getType(), packet_type)
+        return packet
+
+    def checkAnswerPacket(self, conn, packet_type, answered_packet=None):
+        """ Check if an answer-packet with the right type is sent """
+        calls = conn.mockGetNamedCalls('answer')
+        self.assertEquals(len(calls), 1)
+        packet = calls[0].getParam(0)
+        self.assertTrue(isinstance(packet, protocol.Packet))
+        self.assertEquals(packet.getType(), packet_type)
+        if answered_packet is not None:
+            a_packet = calls[0].getParam(1)
+            self.assertEquals(a_packet, answered_packet)
+            self.assertEquals(a_packet.getId(), answered_packet.getId())
+        return packet
+
+    def checkNotifyPacket(self, conn, packet_type, packet_number=0):
+        """ Check if a notify-packet with the right type is sent """
+        calls = conn.mockGetNamedCalls('notify')
+        self.assertTrue(len(calls) > packet_number)
+        packet = calls[packet_number].getParam(0)
+        self.assertTrue(isinstance(packet, protocol.Packet))
+        self.assertEquals(packet.getType(), packet_type)
+        return packet
+
+    def checkNotifyNodeInformation(self, conn, packet_number=0):
+        """ Check Notify Node Information message has been send"""
+        return self.checkNotifyPacket(conn, protocol.NOTIFY_NODE_INFORMATION,
+                packet_number)
+
+    def checkSendPartitionTable(self, conn, packet_number=0):
+        """ Check partition table has been send"""
+        return self.checkNotifyPacket(conn, protocol.SEND_PARTITION_TABLE, 
+                packet_number)
+
+    def checkStartOperation(self, conn, packet_number=0):
+        """ Check start operation message has been send"""
+        return self.checkNotifyPacket(conn, protocol.START_OPERATION, 
+                packet_number)
+
+    def checkNotifyTransactionFinished(self, conn, packet_number=0):
+        """ Check notifyTransactionFinished message has been send"""
+        return self.checkNotifyPacket(conn, protocol.NOTIFY_TRANSACTION_FINISHED,
+                packet_number)
+
+    def checkLockInformation(self, conn):
+        """ Check lockInformation message has been send"""
+        return self.checkAskPacket(conn, protocol.LOCK_INFORMATION)
+
+    def checkUnlockInformation(self, conn):
+        """ Check unlockInformation message has been send"""
+        return self.checkAskPacket(conn, protocol.UNLOCK_INFORMATION)
+
+    def checkAcceptNodeIdentification(self, conn, answered_packet=None):
+        """ Check Accept Node Identification has been answered """
+        return self.checkAnswerPacket(conn, protocol.ACCEPT_NODE_IDENTIFICATION, 
+                answered_packet)
+
+    def checkAnswerPrimaryMaster(self, conn, answered_packet=None):
+        """ Check Answer primaty master message has been send"""
+        return self.checkAnswerPacket(conn, protocol.ANSWER_PRIMARY_MASTER,
+                answered_packet)
+
+    def checkAnswerLastIDs(self, conn, packet_number=0):
+        """ Check answerLastIDs message has been send"""
+        return self.checkAnswerPacket(conn, protocol.ANSWER_LAST_IDS)
+
+    def checkAnswerUnfinishedTransactions(self, conn, packet_number=0):
+        """ Check answerUnfinishedTransactions message has been send"""
+        return self.checkAnswerPacket(conn,
+                protocol.ANSWER_UNFINISHED_TRANSACTIONS)