Commit 617413a9 authored by Jérome Perrin's avatar Jérome Perrin Committed by Xiaowu Zhang

fixup! runTestSuite: support multiple zserver addresses and frontends URLs

This was not really backward compatible with old slapos versions not passing
zserver_address_list
parent 8d35fde0
......@@ -24,10 +24,11 @@ class ERP5TypeTestSuite(TestSuite):
if self.__dict__.has_key("bt5_path"):
args = ("--bt5_path=%s" % self.bt5_path,) + args
instance_number = self.instance or 1
args = (
'--zserver=%s' % self.zserver_address_list[instance_number-1],
'--zserver_frontend_url=%s' % self.zserver_frontend_url_list[instance_number-1],
) + args
if self.zserver_address_list:
args = (
'--zserver=%s' % self.zserver_address_list[instance_number-1],
'--zserver_frontend_url=%s' % self.zserver_frontend_url_list[instance_number-1],
) + args
mysql_db_list = self.mysql_db_list[
(instance_number-1) * self.mysql_db_count:
(instance_number) * self.mysql_db_count]
......
......@@ -111,7 +111,7 @@ def main():
test_suite_title = args.test_suite_title or args.test_suite
revision = args.revision
if len(args.zserver_address_list.split(",")) < args.node_quantity:
if args.zserver_address_list and len(args.zserver_address_list.split(",")) < args.node_quantity:
print >> sys.stderr, 'Not enough zserver address/frontends for node quantity %s (%r)' % (
args.node_quantity, args.zserver_address_list)
sys.exit(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