Merge PR 373

    test file reverse sync with apache svn

Author: icing

test/modules/md/test_300_conf_validate.py

@@ -258,6 +258,7 @@ def test_md_300_013(self, env):
     def test_md_300_014(self, env):
         MDConf(env, text=f"""
             MDomain www.{env.http_tld} www.example2.org
+            MDRenewMode manual
 
             <VirtualHost *:12346>
                 ServerName www.example2.org
@@ -273,6 +274,7 @@ def test_md_300_015(self, env):
             MDPrivateKeys RSA 2048
             MDPrivateKeys RSA 3072
             MDPrivateKeys RSA 4096
+            MDRenewMode manual
             """).install()
         assert env.apache_restart() == 0, f'{env.apachectl_stderr}'
 

test/modules/md/test_702_auto.py

@@ -624,6 +624,13 @@ def test_md_702_041(self, env):
         # check that acme-tls/1 is available for none of the domains
         stat = env.get_md_status(domain)
         assert stat["proto"]["acme-tls/1"] == []
+        MDConf(env).install()
+        assert env.apache_restart() == 0, f'{env.apachectl_stderr}'
+        env.httpd_error_log.ignore_recent(matches=[
+            r'.*None of offered challenge types for domain.*',
+        ], lognos=[
+            "AH10056"  # challenges not available
+        ])
 
     # test case: 2.4.40 mod_ssl stumbles over a SSLCertificateChainFile when installing
     # a fallback certificate