From 88df1be57a511c9a419330602f9842b9a31bac05 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Tue, 23 Jul 2013 15:50:00 +0200 Subject: [PATCH] erp5: Do not install a test runner when there are no test databases. --- stack/erp5/buildout.cfg | 2 +- stack/erp5/instance-zope.cfg.in | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index 373851bc6..7685f9f1b 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -284,7 +284,7 @@ md5sum = 4d2207931975e580d04d0b0506034564 [template-zope] < = download-base filename = instance-zope.cfg.in -md5sum = f1245467092b4457f4363f9b7bc65e98 +md5sum = a3d1f6298d132426a9752935bb91d4af link-binary = ${coreutils:location}/bin/basename ${coreutils:location}/bin/cat diff --git a/stack/erp5/instance-zope.cfg.in b/stack/erp5/instance-zope.cfg.in index 772bc8246..f5cffbc58 100644 --- a/stack/erp5/instance-zope.cfg.in +++ b/stack/erp5/instance-zope.cfg.in @@ -15,7 +15,8 @@ partition. No more (undefined result), no less (IndexError). -#} {% set ipv4 = (ipv4_set | list)[0] -%} -[test-runner] +{% if slapparameter_dict['mysql-test-url-list'] -%} +[{{ section('test-runner') }}] recipe = slapos.cookbook:erp5.test certificate-authority-path = ${test-certificate-authority:ca-dir} mysql-url-list = {{ dumps(slapparameter_dict['mysql-test-url-list']) }} @@ -40,6 +41,7 @@ ca-private = ${directory:ca-private} ca-certs = ${directory:ca-certs} ca-newcerts = ${directory:ca-newcerts} ca-crl = ${directory:ca-crl} +{%- endif %} [directory] recipe = slapos.cookbook:mkdirectory @@ -300,7 +302,6 @@ develop-eggs-directory = {{ develop_eggs_directory }} extends = {{ parameter_dict['instance-logrotate-cfg'] }} parts += - test-runner erp5-promise {{ part_list | join('\n ') }} publish-zope -- 2.30.9