Commit 6f0fa7c9 authored by Jérome Perrin's avatar Jérome Perrin

runUnitTest: add compatibility layer for conversion_server_(hostname/port)

Build a conversion_server_url from conversion_server_(hostname/port), so
that we can already stop using the old parameters
parent bc65ab1d
...@@ -10,6 +10,7 @@ import signal ...@@ -10,6 +10,7 @@ import signal
import shutil import shutil
import errno import errno
import random import random
from warnings import warn
import transaction import transaction
from glob import glob from glob import glob
try: try:
...@@ -735,6 +736,9 @@ def main(argument_list=None): ...@@ -735,6 +736,9 @@ def main(argument_list=None):
bt5_path_list = [] bt5_path_list = []
conversion_server_hostname = None
conversion_server_port = None
for opt, arg in opts: for opt, arg in opts:
if opt in ("-v", "--verbose"): if opt in ("-v", "--verbose"):
os.environ['VERBOSE'] = "1" os.environ['VERBOSE'] = "1"
...@@ -800,9 +804,9 @@ def main(argument_list=None): ...@@ -800,9 +804,9 @@ def main(argument_list=None):
elif opt == "--conversion_server_url": elif opt == "--conversion_server_url":
os.environ["conversion_server_url"] = arg os.environ["conversion_server_url"] = arg
elif opt == "--conversion_server_hostname": elif opt == "--conversion_server_hostname":
os.environ["conversion_server_hostname"] = arg conversion_server_hostname = arg
elif opt == "--conversion_server_port": elif opt == "--conversion_server_port":
os.environ["conversion_server_port"] = arg conversion_server_port = arg
elif opt == "--volatile_memcached_server_hostname": elif opt == "--volatile_memcached_server_hostname":
os.environ["volatile_memcached_server_hostname"] = arg os.environ["volatile_memcached_server_hostname"] = arg
elif opt == "--volatile_memcached_server_port": elif opt == "--volatile_memcached_server_port":
...@@ -837,6 +841,17 @@ def main(argument_list=None): ...@@ -837,6 +841,17 @@ def main(argument_list=None):
elif opt == "--instance_home": elif opt == "--instance_home":
instance_home = os.path.abspath(arg) instance_home = os.path.abspath(arg)
# BBB rewrite deprecated conversion_server_hostname / conversion_server_port into
# the equivalent conversion_server_url
if conversion_server_hostname and conversion_server_port and \
not os.environ.get('conversion_server_url'):
conversion_server_url = 'http://%s:%s' % (
conversion_server_hostname, conversion_server_port)
warn('conversion_server_hostname/conversion_server_port are deprecated.\n'
'Using %s as conversion_server_url instead' % conversion_server_url,
DeprecationWarning)
os.environ['conversion_server_url'] = conversion_server_url
bt5_path_list += filter(None, bt5_path_list += filter(None,
os.environ.get("erp5_tests_bt5_path", "").split(',')) os.environ.get("erp5_tests_bt5_path", "").split(','))
valid_path_list = [] valid_path_list = []
......
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