Remove duplicate and useless getNewUUID() definitions in test cases and inherit

from NeoTestBase.


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

neo/tests/__init__.py

@@ -49,14 +49,6 @@ DB_ADMIN = 'root'
 DB_PASSWD = None
 DB_USER = 'test'
 
-def getNewUUID():
-    """ Return a valid UUID """
-    uuid = protocol.INVALID_UUID
-    while uuid == protocol.INVALID_UUID:
-        uuid = os.urandom(16)
-    self.uuid = uuid
-    return uuid
-
 class NeoTestBase(unittest.TestCase):
     """ Base class for neo tests, implements common checks """
 
@@ -116,7 +108,12 @@ class NeoTestBase(unittest.TestCase):
     # XXX: according to changes with namespaced UUIDs, it would be better to 
     # implement get<NodeType>UUID() methods 
     def getNewUUID(self):
-        return getNewUUID()
+        """ 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 """
@@ -333,20 +330,6 @@ class NeoTestBase(unittest.TestCase):
 
 connector_cpt = 0
 
-# XXX This function is specific to a primary master test, I think.
-# It should not be here (as it shadows a more generic getNewUUID above).
-# master node with the highest uuid will be declared as PMN
-previous_uuid = None
-def getNewUUID():
-    global previous_uuid
-    uuid = protocol.INVALID_UUID
-    while uuid == protocol.INVALID_UUID or (previous_uuid is \
-              not None and uuid > previous_uuid):
-        uuid = os.urandom(16)
-    logging.info("previous_uuid > uuid %s"%(previous_uuid > uuid))
-    previous_uuid = uuid
-    return uuid
-
 class DoNothingConnector(Mock):
   def __init__(self, s=None):
     logging.info("initializing connector")

neo/tests/master/testElectionHandler.py

@@ -162,17 +162,6 @@ class MasterServerElectionTests(NeoTestBase):
         ClientConnection._addPacket = self._addPacket
         ClientConnection.expectMessage = self.expectMessage
 
-    # 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 identifyToMasterNode(self, node_type=STORAGE_NODE_TYPE, ip="127.0.0.1",
                              port=10021):
         """Do first step of identification to MN

neo/tests/storage/testStorageApp.py

@@ -38,13 +38,6 @@ class StorageAppTests(NeoTestBase):
     def tearDown(self):
         NeoTestBase.tearDown(self)
 
-    def getNewUUID(self):
-        uuid = INVALID_UUID
-        while uuid == INVALID_UUID:
-            uuid = os.urandom(16)
-        self.uuid = uuid
-        return uuid
-
     def test_01_loadPartitionTable(self):
       self.assertEqual(len(self.app.dm.getPartitionTable()), 0)
       self.assertEqual(self.app.pt, None)

neo/tests/testConfig.py

@@ -20,23 +20,17 @@ from mock import Mock
 from neo.protocol import RUNNING_STATE, TEMPORARILY_DOWN_STATE, DOWN_STATE, BROKEN_STATE, \
         MASTER_NODE_TYPE, STORAGE_NODE_TYPE, CLIENT_NODE_TYPE, INVALID_UUID
 from neo.config import ConfigurationManager
+from neo.tests import NeoTestBase
 from tempfile import mkstemp
 
 
-class ConfigurationManagerTests(unittest.TestCase):
+class ConfigurationManagerTests(NeoTestBase):
 
     def setUp(self):
         pass
     def tearDown(self):
         pass
 
-    def getNewUUID(self):
-        uuid = INVALID_UUID
-        while uuid == INVALID_UUID:
-            uuid = os.urandom(16)
-        self.uuid = uuid
-        return uuid
-
     def test_01_configuration_manager(self):      
         # initialisation
         #create a fake configuration file

neo/tests/testConnection.py

@@ -31,14 +31,9 @@ from neo.connector import ConnectorException, ConnectorTryAgainException, \
 from neo.protocol import Packet, ProtocolError, PROTOCOL_ERROR_CODE, ERROR,INTERNAL_ERROR_CODE, \
      ANSWER_PRIMARY_MASTER
 from neo import protocol
+from neo.tests import NeoTestBase
 
-def getNewUUID():
-    uuid = INVALID_UUID
-    while uuid == INVALID_UUID:
-        uuid = os.urandom(16)
-    return uuid
-
-class ConnectionTests(unittest.TestCase):
+class ConnectionTests(NeoTestBase):
 
     def setUp(self):
         pass

neo/tests/testNodes.py

@@ -20,22 +20,17 @@ from mock import Mock
 from neo.protocol import RUNNING_STATE, TEMPORARILY_DOWN_STATE, DOWN_STATE, BROKEN_STATE, \
         MASTER_NODE_TYPE, STORAGE_NODE_TYPE, CLIENT_NODE_TYPE, INVALID_UUID
 from neo.node import Node, MasterNode, StorageNode, ClientNode, NodeManager
+from neo.tests import NeoTestBase
 from time import time
 
-class NodesTests(unittest.TestCase):
+class NodesTests(NeoTestBase):
 
     def setUp(self):
         pass
+
     def tearDown(self):
         pass
 
-    def getNewUUID(self):
-        uuid = INVALID_UUID
-        while uuid == INVALID_UUID:
-            uuid = os.urandom(16)
-        self.uuid = uuid
-        return uuid
-
     def test_01_node(self):
         # initialisation
         server = ("127.0.0.1", 10000)

neo/tests/testProtocol.py

@@ -19,9 +19,10 @@ import unittest, os
 from mock import Mock
 from neo import protocol
 from neo.protocol import *
+from neo.tests import NeoTestBase
 from time import time, gmtime
 
-class ProtocolTests(unittest.TestCase):
+class ProtocolTests(NeoTestBase):
 
     def setUp(self):
         self.ltid = INVALID_TID
@@ -53,13 +54,6 @@ class ProtocolTests(unittest.TestCase):
         self.ltid = tid
         return tid
 
-    def getNewUUID(self):
-        uuid = INVALID_UUID
-        while uuid == INVALID_UUID:
-            uuid = os.urandom(16)
-        self.uuid = uuid
-        return uuid
-
     def test_01_Packet_init(self):
         p = Packet(msg_type=ASK_PRIMARY_MASTER, body=None)
         self.assertEqual(p.getType(), ASK_PRIMARY_MASTER)