From 2dc4bf14e2a2f8e58ac64c109d816198477ea05f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Tue, 24 May 2011 18:14:16 +0200
Subject: [PATCH] Allow to select amount of parallel test databases.
---
slapos/recipe/erp5/setup.py | 2 +-
slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/slapos/recipe/erp5/setup.py b/slapos/recipe/erp5/setup.py
index 459969b610..ad1fbe5c88 100644
--- a/slapos/recipe/erp5/setup.py
+++ b/slapos/recipe/erp5/setup.py
@@ -6,7 +6,7 @@ from setuptools import setup, find_packages
# "."], stdout=subprocess.PIPE).communicate()[0]))
name = "slapos.recipe.erp5"
-version = '1.1-dev-181'
+version = '1.1-dev-182'
def read(name):
return open(name).read()
diff --git a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
index 4385aa37c6..c4f144756a 100644
--- a/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
+++ b/slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
@@ -801,7 +801,8 @@ class Recipe(BaseSlapRecipe):
return 'https://[%(ip)s]:%(port)s' % apache_conf
def installMysqlServer(self, ip, port, database='erp5', user='user',
- test_database='test_erp5', test_user='test_user', template_filename=None):
+ test_database='test_erp5', test_user='test_user', template_filename=None,
+ parallel_test_database_amount=100):
backup_directory = self.createBackupDirectory('mysql')
if template_filename is None:
template_filename = self.getTemplateFilename('my.cnf.in')
@@ -824,7 +825,7 @@ class Recipe(BaseSlapRecipe):
mysql_test_user=test_user,
mysql_parallel_test_dict=[
('test_%i' % x,)*2 + (self.generatePassword(),) \
- for x in xrange(0,100)],
+ for x in xrange(0,parallel_test_database_amount)],
)
self.registerLogRotation('mysql', [error_log, slow_query_log],
'%(mysql_binary)s --no-defaults -B --user=root '
--
2.30.9