svn commit: r1909454 - in /httpd/httpd/trunk/test: modules/tls/test_05_proto.py pyhttpd/env.py

[ic...@apache.org]

Author: icing
Date: Thu Apr 27 11:58:41 2023
New Revision: 1909454

URL: http://svn.apache.org/viewvc?rev=1909454&view=rev
Log:
make test cases for mod_tls work, do not clear gen directory on every invocation


Modified:
    httpd/httpd/trunk/test/modules/tls/test_05_proto.py
    httpd/httpd/trunk/test/pyhttpd/env.py

Modified: httpd/httpd/trunk/test/modules/tls/test_05_proto.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/modules/tls/test_05_proto.py?rev=1909454&r1=1909453&r2=1909454&view=diff
==============================================================================
--- httpd/httpd/trunk/test/modules/tls/test_05_proto.py (original)
+++ httpd/httpd/trunk/test/modules/tls/test_05_proto.py Thu Apr 27 11:58:41 2023
@@ -34,12 +34,13 @@ class TestProto:
         r = env.tls_get(env.domain_b, "/index.json", options=["--tlsv1.2"])
         assert r.exit_code == 0, r.stderr
 
+    @pytest.mark.skip('curl does not have TLSv1.3 on all platforms')
     def test_tls_05_proto_1_3(self, env):
-        r = env.tls_get(env.domain_a, "/index.json", options=["--tlsv1.3"])
+        r = env.tls_get(env.domain_a, "/index.json", options=["--tlsv1.3", '-v'])
         if True: # testing TlsTestEnv.curl_supports_tls_1_3() is unreliable (curl should support TLS1.3 nowadays..)
-            assert r.exit_code == 0, r.stderr
+            assert r.exit_code == 0, f'{r}'
         else:
-            assert r.exit_code == 4, r.stderr
+            assert r.exit_code == 4, f'{r}'
 
     def test_tls_05_proto_close(self, env):
         s = socket.create_connection(('localhost', env.https_port))

Modified: httpd/httpd/trunk/test/pyhttpd/env.py
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/pyhttpd/env.py?rev=1909454&r1=1909453&r2=1909454&view=diff
==============================================================================
--- httpd/httpd/trunk/test/pyhttpd/env.py (original)
+++ httpd/httpd/trunk/test/pyhttpd/env.py Thu Apr 27 11:58:41 2023
@@ -96,9 +96,8 @@ class HttpdTestSetup:
         self.env.clear_curl_headerfiles()
 
     def _make_dirs(self):
-        if os.path.exists(self.env.gen_dir):
-            shutil.rmtree(self.env.gen_dir)
-        os.makedirs(self.env.gen_dir)
+        if not os.path.exists(self.env.gen_dir):
+            os.makedirs(self.env.gen_dir)
         if not os.path.exists(self.env.server_logs_dir):
             os.makedirs(self.env.server_logs_dir)