From: Stefan Eissing Date: Fri, 29 Oct 2021 15:08:57 +0000 (+0000) Subject: * test mod_md: check for older pytest request fixture that does X-Git-Tag: 2.5.0-alpha2-ci-test-only~710 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=547873051555fc0d4faf1a38daaa850a830401f6;p=thirdparty%2Fapache%2Fhttpd.git * test mod_md: check for older pytest request fixture that does not always set the originalname property. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1894620 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/test/modules/md/md_env.py b/test/modules/md/md_env.py index f1060671a26..47fecc56a4a 100755 --- a/test/modules/md/md_env.py +++ b/test/modules/md/md_env.py @@ -168,7 +168,8 @@ class MDTestEnv(HttpdTestEnv): return self._store_dir def get_request_domain(self, request): - return "%s-%s" % (re.sub(r'[_]', '-', request.node.originalname), MDTestEnv.DOMAIN_SUFFIX) + name = request.node.originalname if request.node.originalname else request.node.name + return "%s-%s" % (re.sub(r'[_]', '-', name), MDTestEnv.DOMAIN_SUFFIX) def get_method_domain(self, method): return "%s-%s" % (re.sub(r'[_]', '-', method.__name__.lower()), MDTestEnv.DOMAIN_SUFFIX)