Reuse tests for old storage bootstrap handler for the new bootstrap manager.

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

neo/storage/tests/__init__.py

@@ -2,7 +2,6 @@ from neo.storage.tests.testStorageApp import StorageAppTests
 from neo.storage.tests.testStorageMySQLdb import StorageMySQSLdbTests 
 from neo.storage.tests.testInitializationHandler import StorageInitializationHandlerTests
 from neo.storage.tests.testVerificationHandler import StorageVerificationHandlerTests 
-from neo.storage.tests.testBootstrapHandler import StorageBootstrapHandlerTests
 from neo.storage.tests.testStorageHandler import StorageStorageHandlerTests
 from neo.storage.tests.testClientHandler import StorageClientHandlerTests
 from neo.storage.tests.testMasterHandler import StorageMasterHandlerTests
@@ -10,7 +9,6 @@ from neo.storage.tests.testMasterHandler import StorageMasterHandlerTests
 
 __all__ = [
     'StorageAppTests',
-    'StorageBootstrapTests',
     'StorageMySQSLdbTests',
     'StorageInitializationHandlerTests',
     'StorageClientHandlerTests',

neo/tests/__init__.py

@@ -5,6 +5,7 @@ from neo.tests.testHandler import HandlerDecoratorsTests, HandlerTests
 from neo.tests.testNodes import NodesTests
 from neo.tests.testPT import PartitionTableTests
 from neo.tests.testProtocol import ProtocolTests
+from neo.tests.testBootstrap import BootstrapManagerTests
 
 __all__ = [
     'ConfigurationManagerTests',

neo/storage/tests/testBootstrapHandler.py → neo/tests/testBootstrap.py

@@ -23,8 +23,7 @@ from neo.tests.base import NeoTestBase
 from neo.master.app import MasterNode
 from neo.pt import PartitionTable
 from neo.storage.app import Application, StorageNode
-from neo.storage.handlers import BootstrapHandler
-from neo.storage.handlers import VerificationHandler
+from neo.bootstrap import BootstrapManager
 from neo import protocol
 from neo.protocol import STORAGE_NODE_TYPE, MASTER_NODE_TYPE
 from neo.protocol import BROKEN_STATE, RUNNING_STATE, Packet, INVALID_UUID
@@ -32,7 +31,7 @@ from neo.protocol import ACCEPT_NODE_IDENTIFICATION, REQUEST_NODE_IDENTIFICATION
 from neo.protocol import ERROR, BROKEN_NODE_DISALLOWED_CODE, ASK_PRIMARY_MASTER
 from neo.protocol import ANSWER_PRIMARY_MASTER
 
-class StorageBootstrapHandlerTests(NeoTestBase):
+class BootstrapManagerTests(NeoTestBase):
 
     def setUp(self):
         logging.basicConfig(level = logging.ERROR)
@@ -43,7 +42,7 @@ class StorageBootstrapHandlerTests(NeoTestBase):
         for server in self.app.master_node_list:
             self.app.nm.add(MasterNode(server=server))
         self.trying_master_node = self.app.nm.getMasterNodeList()[0]
-        self.bootstrap = BootstrapHandler(self.app)
+        self.bootstrap = BootstrapManager(self.app, 'main', protocol.STORAGE_NODE_TYPE)
         # define some variable to simulate client and storage node
         self.master_port = 10010
         self.storage_port = 10020