Commit 8d35fde0 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 when running with old slapos,
because default value was not string in this case.
parent 0b3d0d2e
...@@ -76,12 +76,12 @@ def main(): ...@@ -76,12 +76,12 @@ def main():
'--zserver_address_list', '--zserver_address_list',
help='A list of comma seperated host:port for ZServer.\n' help='A list of comma seperated host:port for ZServer.\n'
'Also taken from zserver_address_list environment variable.', 'Also taken from zserver_address_list environment variable.',
default=os.getenv('zserver_address_list')) default=os.getenv('zserver_address_list', ''))
slapos_wrapper_group.add_argument( slapos_wrapper_group.add_argument(
'--zserver_frontend_url_list', '--zserver_frontend_url_list',
help='A list of comma seperated frontend URLs, one for each of zserver_address_list,' help='A list of comma seperated frontend URLs, one for each of zserver_address_list,'
'in the same order.\nAlso taken from zserver_frontend_url_list environment variable', 'in the same order.\nAlso taken from zserver_frontend_url_list environment variable',
default=os.getenv('zserver_frontend_url_list')) default=os.getenv('zserver_frontend_url_list', ''))
# Parameters passed by test node # Parameters passed by test node
testnode_group = parser.add_argument_group( testnode_group = parser.add_argument_group(
......
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