Commit 64096110 authored by Jérome Perrin's avatar Jérome Perrin

caddy-frontend/test: use curl from $PATH

parent e42eb816
......@@ -190,10 +190,10 @@ def der2pem(der):
return certificate
def isHTTP2(domain, ip):
curl_command = '%(curl)s --http2 -v -k -H "Host: %(domain)s" ' \
curl_command = 'curl --http2 -v -k -H "Host: %(domain)s" ' \
'https://%(domain)s:%(https_port)s/ '\
'--resolve %(domain)s:%(https_port)s:%(ip)s' % dict(
ip=ip, domain=domain, curl=os.environ['CURL'], https_port=HTTPS_PORT)
ip=ip, domain=domain, https_port=HTTPS_PORT)
prc = subprocess.Popen(
curl_command.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE
)
......
......@@ -15,4 +15,4 @@
[template]
filename = instance.cfg
md5sum = 2eba374ea5b7ec6c95a1f79066cfb46b
md5sum = a345d46655c3e841c2ecf4e3a0446c8f
......@@ -36,10 +36,9 @@ command-line =
--source_code_path_list=$${slapos:location}/software/caddy-frontend/test
# XXX slapos.cookbook:wrapper does not allow extending env, so we add some default $PATH entries ( not sure they are needed )
# PATH=${buildout:bin-directory}:/usr/bin/:/bin/
environment =
PATH=${curl:location}/bin/:${openssl:location}/bin/:/usr/bin/:/bin
LOCAL_IPV4=$${slap-configuration:ipv4-random}
GLOBAL_IPV6=$${slap-configuration:ipv6-random}
CURL=${curl:location}/bin/curl
SLAPOS_TEST_WORKING_DIR=$${create-directory:working-dir}
TEST_SR=${template:test_software_release}
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