diff options
author | Stefan Eissing <icing@apache.org> | 2021-11-30 17:10:13 +0000 |
---|---|---|
committer | Stefan Eissing <icing@apache.org> | 2021-11-30 17:10:13 +0000 |
commit | 0d3b3abf47028804d53d7130fc1490aac4efe226 (patch) | |
tree | 8330c103eb0268d2070a2d8076af7e1a0c2e851c /test/pyhttpd | |
parent | 1c5f651841f7e53ec64a8a07a5ae7f9cfa639500 (diff) | |
download | httpd-0d3b3abf47028804d53d7130fc1490aac4efe226.tar.gz |
* test: check the h2load version for test suite making use
of its --connect-to feature (available since 1.41.0).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1895434 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/pyhttpd')
-rw-r--r-- | test/pyhttpd/env.py | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/test/pyhttpd/env.py b/test/pyhttpd/env.py index be28e99790..97d2272097 100644 --- a/test/pyhttpd/env.py +++ b/test/pyhttpd/env.py @@ -182,7 +182,11 @@ class HttpdTestEnv: self._curl = self.config.get('global', 'curl_bin') self._nghttp = self.config.get('global', 'nghttp') + if self._nghttp is None: + self._nghttp = 'nghttp' self._h2load = self.config.get('global', 'h2load') + if self._h2load is None: + self._h2load = 'h2load' self._http_port = int(self.config.get('test', 'http_port')) self._https_port = int(self.config.get('test', 'https_port')) @@ -382,6 +386,19 @@ class HttpdTestEnv: def has_h2load(self): return self._h2load != "" + def h2load_is_at_least(self, minv): + if not self.has_h2load(): + return False + p = subprocess.run([self._h2load, '--version'], capture_output=True, text=True) + if p.returncode != 0: + return False + s = p.stdout.strip() + m = re.match(r'h2load nghttp2/(\S+)', s) + if m: + hv = self._versiontuple(m.group(1)) + return hv >= self._versiontuple(minv) + return False + def has_nghttp(self): return self._nghttp != "" |