Commit 78464894 authored by Grégory Wisniewski's avatar Grégory Wisniewski

Allow disable verbose log levelin functional tests.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@1714 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 3fd4afc0
...@@ -143,8 +143,10 @@ class NEOCluster(object): ...@@ -143,8 +143,10 @@ class NEOCluster(object):
db_user='neo', db_password='neo', db_user='neo', db_password='neo',
db_super_user='root', db_super_password=None, db_super_user='root', db_super_password=None,
cleanup_on_delete=False, temp_dir=None, cleanup_on_delete=False, temp_dir=None,
clear_databases=True, adapter='MySQL'): clear_databases=True, adapter='MySQL',
verbose=True):
self.cleanup_on_delete = cleanup_on_delete self.cleanup_on_delete = cleanup_on_delete
self.verbose = verbose
self.uuid_set = set() self.uuid_set = set()
self.db_super_user = db_super_user self.db_super_user = db_super_user
self.db_super_password = db_super_password self.db_super_password = db_super_password
...@@ -161,7 +163,7 @@ class NEOCluster(object): ...@@ -161,7 +163,7 @@ class NEOCluster(object):
self.temp_dir = temp_dir self.temp_dir = temp_dir
# Setup client logger # Setup client logger
real_setupLog(name='CLIENT', filename=os.path.join(self.temp_dir, real_setupLog(name='CLIENT', filename=os.path.join(self.temp_dir,
'client.log'), verbose=True) 'client.log'), verbose=self.verbose)
admin_port = self.__allocatePort() admin_port = self.__allocatePort()
self.cluster_name = 'neo_%s' % (random.randint(0, 100), ) self.cluster_name = 'neo_%s' % (random.randint(0, 100), )
master_node_list = [self.__allocatePort() for i in xrange(master_node_count)] master_node_list = [self.__allocatePort() for i in xrange(master_node_count)]
...@@ -201,9 +203,11 @@ class NEOCluster(object): ...@@ -201,9 +203,11 @@ class NEOCluster(object):
def __newProcess(self, command, arguments): def __newProcess(self, command, arguments):
uuid = self.__allocateUUID() uuid = self.__allocateUUID()
arguments['--uuid'] = uuid arguments['--uuid'] = uuid
arguments['--verbose'] = None if self.verbose:
arguments['--verbose'] = True
logfile = arguments['--name'] logfile = arguments['--name']
arguments['--logfile'] = os.path.join(self.temp_dir, '%s.log' % (logfile, )) arguments['--logfile'] = os.path.join(self.temp_dir, '%s.log' % (logfile, ))
self.process_dict.setdefault(command, []).append( self.process_dict.setdefault(command, []).append(
NEOProcess(command, uuid, arguments)) NEOProcess(command, uuid, arguments))
......
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