Fix imports in unit tests

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

neo/client/tests/testClientHandler.py

@@ -26,9 +26,10 @@ from neo.protocol import \
      INVALID_PTID, STORAGE_NODE_TYPE, CLIENT_NODE_TYPE, MASTER_NODE_TYPE, \
      RUNNING_STATE, BROKEN_STATE, TEMPORARILY_DOWN_STATE, \
      UP_TO_DATE_STATE, FEEDING_STATE, DISCARDED_STATE
-from neo.client.handlers import BaseHandler, PrimaryBootstrapHandler
-from neo.client.handlers import PrimaryNotificationsHandler, PrimaryAnswersHandler
-from neo.client.handlers import StorageBootstrapHandler, StorageAnswersHandler
+from neo.client.handlers import BaseHandler
+from neo.client.handlers.master import PrimaryBootstrapHandler
+from neo.client.handlers.master import PrimaryNotificationsHandler, PrimaryAnswersHandler
+from neo.client.handlers.storage import StorageBootstrapHandler, StorageAnswersHandler
 
 MARKER = []
 

neo/master/tests/testClientHandler.py

@@ -24,7 +24,7 @@ from neo.tests.base import NeoTestBase
 import neo.master
 from neo import protocol
 from neo.protocol import Packet, INVALID_UUID
-from neo.master.handlers import ClientServiceHandler
+from neo.master.handlers.client import ClientServiceHandler
 from neo.master.app import Application
 from neo.protocol import ERROR, PING, PONG, ANNOUNCE_PRIMARY_MASTER, \
      REELECT_PRIMARY_MASTER, NOTIFY_NODE_INFORMATION,  \

neo/master/tests/testElectionHandler.py

@@ -23,7 +23,7 @@ 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.handlers import ClientElectionHandler, ServerElectionHandler
+from neo.master.handlers.election import ClientElectionHandler, ServerElectionHandler
 from neo.master.app import Application
 from neo.protocol import ERROR, REQUEST_NODE_IDENTIFICATION, ACCEPT_NODE_IDENTIFICATION, \
      PING, PONG, ASK_PRIMARY_MASTER, ANSWER_PRIMARY_MASTER, ANNOUNCE_PRIMARY_MASTER, \

neo/master/tests/testRecoveryHandler.py

@@ -23,7 +23,7 @@ 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.handlers import RecoveryHandler
+from neo.master.handlers.recovery import RecoveryHandler
 from neo.master.app import Application
 from neo.protocol import ERROR, REQUEST_NODE_IDENTIFICATION, ACCEPT_NODE_IDENTIFICATION, \
      PING, PONG, ASK_PRIMARY_MASTER, ANSWER_PRIMARY_MASTER, ANNOUNCE_PRIMARY_MASTER, \

neo/master/tests/testStorageHandler.py

@@ -24,7 +24,7 @@ from neo.tests.base import NeoTestBase
 import neo.master
 from neo import protocol
 from neo.protocol import Packet, INVALID_UUID
-from neo.master.handlers import StorageServiceHandler
+from neo.master.handlers.storage import StorageServiceHandler
 from neo.master.app import Application
 from neo.protocol import ERROR, PING, PONG, ANNOUNCE_PRIMARY_MASTER, \
      REELECT_PRIMARY_MASTER, NOTIFY_NODE_INFORMATION,  \

neo/master/tests/testVerificationHandler.py

@@ -23,7 +23,7 @@ from struct import pack, unpack
 import neo
 from neo.tests.base import NeoTestBase
 from neo.protocol import Packet, INVALID_UUID
-from neo.master.handlers import VerificationHandler
+from neo.master.handlers.verification import VerificationHandler
 from neo.master.app import Application
 from neo import protocol
 from neo.protocol import ERROR, ANNOUNCE_PRIMARY_MASTER, \

neo/storage/tests/testClientHandler.py

@@ -25,7 +25,7 @@ from neo.tests.base import NeoTestBase
 from neo.master.app import MasterNode
 from neo.storage.app import Application, StorageNode
 from neo.storage.handlers.client import TransactionInformation
-from neo.storage.handlers import ClientOperationHandler
+from neo.storage.handlers.client import ClientOperationHandler
 from neo.exception import PrimaryFailure, OperationFailure
 from neo.pt import PartitionTable
 from neo import protocol

neo/storage/tests/testInitializationHandler.py

@@ -24,7 +24,7 @@ from neo import protocol
 from neo.node import MasterNode
 from neo.pt import PartitionTable
 from neo.storage.app import Application, StorageNode
-from neo.storage.handlers import InitializationHandler
+from neo.storage.handlers.initialization import InitializationHandler
 from neo.protocol import STORAGE_NODE_TYPE, MASTER_NODE_TYPE, CLIENT_NODE_TYPE
 from neo.protocol import BROKEN_STATE, RUNNING_STATE, Packet, INVALID_UUID, \
      UP_TO_DATE_STATE, INVALID_TID, PROTOCOL_ERROR_CODE

neo/storage/tests/testMasterHandler.py

@@ -24,7 +24,7 @@ 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.handlers import MasterOperationHandler
+from neo.storage.handlers.master import MasterOperationHandler
 from neo.exception import PrimaryFailure, OperationFailure
 from neo.pt import PartitionTable
 from neo import protocol

neo/storage/tests/testStorageHandler.py

@@ -24,7 +24,7 @@ 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.handlers import StorageOperationHandler
+from neo.storage.handlers.storage import StorageOperationHandler
 from neo import protocol
 from neo.protocol import *
 

neo/storage/tests/testVerificationHandler.py

@@ -24,7 +24,7 @@ from neo import protocol
 from neo.node import MasterNode
 from neo.pt import PartitionTable
 from neo.storage.app import Application, StorageNode
-from neo.storage.handlers import VerificationHandler
+from neo.storage.handlers.verification import VerificationHandler
 from neo.protocol import STORAGE_NODE_TYPE, MASTER_NODE_TYPE, CLIENT_NODE_TYPE
 from neo.protocol import BROKEN_STATE, RUNNING_STATE, Packet, INVALID_UUID, \
      UP_TO_DATE_STATE, INVALID_OID, INVALID_TID, PROTOCOL_ERROR_CODE