From 43d16f61e17b9e4625b169c245e087ea29893051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Wed, 12 Sep 2018 04:57:45 +0200 Subject: [PATCH] fixup! fixup! runTestSuite: support multiple zserver addresses and frontends URLs ''.split(',') is [''] which evaluates to false ... e80b37ffbff02f41dc17c48c081676490b83f770 was still incorrect --- product/ERP5Type/tests/runTestSuite.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/product/ERP5Type/tests/runTestSuite.py b/product/ERP5Type/tests/runTestSuite.py index 4539b5bb58..c89cbd3faf 100644 --- a/product/ERP5Type/tests/runTestSuite.py +++ b/product/ERP5Type/tests/runTestSuite.py @@ -38,8 +38,8 @@ def makeSuite( suite = suite_class(revision=revision, max_instance_count=node_quantity, mysql_db_list=db_list.split(','), - zserver_address_list=zserver_address_list.split(','), - zserver_frontend_url_list=zserver_frontend_url_list.split(','), + zserver_address_list=zserver_address_list, + zserver_frontend_url_list=zserver_frontend_url_list, **kwargs) return suite @@ -111,13 +111,18 @@ def main(): test_suite_title = args.test_suite_title or args.test_suite revision = args.revision - if args.zserver_address_list and len(args.zserver_address_list.split(",")) < args.node_quantity: + args.zserver_address_list = ( + args.zserver_address_list.split(',') if args.zserver_address_list else ()) + args.zserver_frontend_url_list = ( + args.zserver_frontend_url_list.split(',') if args.zserver_frontend_url_list else ()) + + if args.zserver_address_list and len(args.zserver_address_list) < 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) # sanity check - assert len(args.zserver_address_list.split(",")) == len(args.zserver_frontend_url_list.split(",")) + assert len(args.zserver_address_list) == len(args.zserver_frontend_url_list) suite = makeSuite(test_suite=args.test_suite, node_quantity=args.node_quantity, -- 2.30.9