Commit c2d7f97e authored by Julien Muchembled's avatar Julien Muchembled

tools: use same DB prefix as for tests

parent be3c276b
...@@ -6,6 +6,7 @@ import math ...@@ -6,6 +6,7 @@ import math
import traceback import traceback
from time import time from time import time
from neo.tests import DB_PREFIX
from neo.tests.benchmark import BenchmarkRunner from neo.tests.benchmark import BenchmarkRunner
from ZODB.FileStorage import FileStorage from ZODB.FileStorage import FileStorage
...@@ -85,7 +86,7 @@ class MatrixImportBenchmark(BenchmarkRunner): ...@@ -85,7 +86,7 @@ class MatrixImportBenchmark(BenchmarkRunner):
else: else:
from neo.tests.functional import NEOCluster from neo.tests.functional import NEOCluster
neo = NEOCluster( neo = NEOCluster(
db_list=['neot_matrix_%d' % i for i in xrange(storages)], db_list=['%s_matrix_%u' % (DB_PREFIX, i) for i in xrange(storages)],
clear_databases=True, clear_databases=True,
master_count=masters, master_count=masters,
partitions=partitions, partitions=partitions,
......
...@@ -8,6 +8,7 @@ import traceback ...@@ -8,6 +8,7 @@ import traceback
from time import time from time import time
from ZODB.FileStorage import FileStorage from ZODB.FileStorage import FileStorage
from neo.tests import DB_PREFIX
from neo.tests.benchmark import BenchmarkRunner from neo.tests.benchmark import BenchmarkRunner
from neo.tests.functional import NEOCluster from neo.tests.functional import NEOCluster
from neo.lib.profiling import PROFILING_ENABLED, profiler_decorator, \ from neo.lib.profiling import PROFILING_ENABLED, profiler_decorator, \
...@@ -38,7 +39,8 @@ class ImportBenchmark(BenchmarkRunner): ...@@ -38,7 +39,8 @@ class ImportBenchmark(BenchmarkRunner):
config = self._config config = self._config
# start neo # start neo
neo = NEOCluster( neo = NEOCluster(
db_list=['neot_perfs_%d' % i for i in xrange(config.storages)], db_list=['%s_perfs_%u' % (DB_PREFIX, i)
for i in xrange(config.storages)],
clear_databases=True, clear_databases=True,
partitions=config.partitions, partitions=config.partitions,
replicas=config.replicas, replicas=config.replicas,
......
...@@ -9,6 +9,7 @@ from ZODB.tests.StorageTestBase import zodb_pickle ...@@ -9,6 +9,7 @@ from ZODB.tests.StorageTestBase import zodb_pickle
from neo.lib.util import p64 from neo.lib.util import p64
from neo.lib.protocol import CellStates from neo.lib.protocol import CellStates
from neo.tests import DB_PREFIX
from neo.tests.benchmark import BenchmarkRunner from neo.tests.benchmark import BenchmarkRunner
from neo.tests.functional import NEOCluster from neo.tests.functional import NEOCluster
...@@ -68,7 +69,7 @@ class ReplicationBenchmark(BenchmarkRunner): ...@@ -68,7 +69,7 @@ class ReplicationBenchmark(BenchmarkRunner):
config = self._config config = self._config
# build a neo # build a neo
neo = NEOCluster( neo = NEOCluster(
db_list=['neot_replication_%d' % i for i in xrange(2)], db_list=['%s_replication_%u' % (DB_PREFIX, i) for i in xrange(2)],
clear_databases=True, clear_databases=True,
partitions=config.partitions, partitions=config.partitions,
replicas=1, replicas=1,
......
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