]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
* test mod_md: check for older pytest request fixture that does
authorStefan Eissing <icing@apache.org>
Fri, 29 Oct 2021 15:08:57 +0000 (15:08 +0000)
committerStefan Eissing <icing@apache.org>
Fri, 29 Oct 2021 15:08:57 +0000 (15:08 +0000)
   not always set the originalname property.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1894620 13f79535-47bb-0310-9956-ffa450edef68

test/modules/md/md_env.py

index f1060671a26a03e14efee0e2da797c0e0fe7d5db..47fecc56a4a8c5cc1fd2815864a9e269374f2983 100755 (executable)
@@ -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)