Commit d0c3276a authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 6a74de9c
...@@ -31,40 +31,40 @@ from neo.tests.benchmark import BenchmarkRunner ...@@ -31,40 +31,40 @@ from neo.tests.benchmark import BenchmarkRunner
# list of test modules # list of test modules
# each of them have to import its TestCase classes # each of them have to import its TestCase classes
UNIT_TEST_MODULES = [ UNIT_TEST_MODULES = [
# # generic parts # generic parts
# 'neo.tests.testBootstrap', 'neo.tests.testBootstrap',
# 'neo.tests.testConnection', 'neo.tests.testConnection',
# 'neo.tests.testHandler', 'neo.tests.testHandler',
# 'neo.tests.testNodes', 'neo.tests.testNodes',
# 'neo.tests.testDispatcher', 'neo.tests.testDispatcher',
# 'neo.tests.testUtil', 'neo.tests.testUtil',
# 'neo.tests.testPT', 'neo.tests.testPT',
# # master application # master application
# 'neo.tests.master.testClientHandler', 'neo.tests.master.testClientHandler',
# 'neo.tests.master.testElectionHandler', 'neo.tests.master.testElectionHandler',
# 'neo.tests.master.testMasterApp', 'neo.tests.master.testMasterApp',
# 'neo.tests.master.testMasterPT', 'neo.tests.master.testMasterPT',
# 'neo.tests.master.testRecovery', 'neo.tests.master.testRecovery',
# 'neo.tests.master.testStorageHandler', 'neo.tests.master.testStorageHandler',
# 'neo.tests.master.testTransactions', 'neo.tests.master.testTransactions',
# # storage application # storage application
# 'neo.tests.storage.testClientHandler', 'neo.tests.storage.testClientHandler',
# 'neo.tests.storage.testInitializationHandler', 'neo.tests.storage.testInitializationHandler',
# 'neo.tests.storage.testMasterHandler', 'neo.tests.storage.testMasterHandler',
# 'neo.tests.storage.testStorageApp', 'neo.tests.storage.testStorageApp',
# 'neo.tests.storage.testStorage' + os.getenv('NEO_TESTS_ADAPTER', 'SQLite'), 'neo.tests.storage.testStorage' + os.getenv('NEO_TESTS_ADAPTER', 'SQLite'),
# 'neo.tests.storage.testIdentificationHandler', 'neo.tests.storage.testIdentificationHandler',
# 'neo.tests.storage.testTransactions', 'neo.tests.storage.testTransactions',
# # client application # client application
# 'neo.tests.client.testClientApp', 'neo.tests.client.testClientApp',
# 'neo.tests.client.testMasterHandler', 'neo.tests.client.testMasterHandler',
# 'neo.tests.client.testStorageHandler', 'neo.tests.client.testStorageHandler',
# 'neo.tests.client.testConnectionPool', 'neo.tests.client.testConnectionPool',
# light functional tests # light functional tests
# 'neo.tests.threaded.test', 'neo.tests.threaded.test',
# 'neo.tests.threaded.testImporter', 'neo.tests.threaded.testImporter',
'neo.tests.threaded.testReplication', 'neo.tests.threaded.testReplication',
# 'neo.tests.threaded.testSSL', 'neo.tests.threaded.testSSL',
] ]
FUNC_TEST_MODULES = [ FUNC_TEST_MODULES = [
...@@ -126,6 +126,7 @@ class NeoTestRunner(unittest.TextTestResult): ...@@ -126,6 +126,7 @@ class NeoTestRunner(unittest.TextTestResult):
print "Import of %s failed : %s" % (test_module, err) print "Import of %s failed : %s" % (test_module, err)
traceback.print_exc() traceback.print_exc()
continue continue
# NOTE it is also possible to run individual tests via `python -m unittest ...`
if 1 or test_module.__name__ == 'neo.tests.functional.testStorage': if 1 or test_module.__name__ == 'neo.tests.functional.testStorage':
suite.addTests(loader.loadTestsFromModule(test_module)) suite.addTests(loader.loadTestsFromModule(test_module))
suite.run(self) suite.run(self)
......
...@@ -18,7 +18,7 @@ from neo.lib import logging ...@@ -18,7 +18,7 @@ from neo.lib import logging
from neo.lib.handler import EventHandler from neo.lib.handler import EventHandler
from neo.lib.util import dump, makeChecksum, add64 from neo.lib.util import dump, makeChecksum, add64
from neo.lib.protocol import Packets, LockState, Errors, ProtocolError, \ from neo.lib.protocol import Packets, LockState, Errors, ProtocolError, \
Errors, ZERO_HASH, INVALID_PARTITION ZERO_HASH, INVALID_PARTITION
from ..transactions import ConflictError, DelayedError, NotRegisteredError from ..transactions import ConflictError, DelayedError, NotRegisteredError
from ..exception import AlreadyPendingError from ..exception import AlreadyPendingError
import time import time
......
#!/usr/bin/env python #!/usr/bin/env python
# kirr: I used this to log-trace how access to a cluster looks in client logs
# (connect, receiving invalidations, etc)
from ZODB import DB from ZODB import DB
from neo.client.Storage import Storage from neo.client.Storage import Storage
......
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