diff options
| author | Stefan Eissing <icing@apache.org> | 2023-04-27 11:58:41 +0000 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2023-04-27 11:58:41 +0000 |
| commit | 10b15a816da1f4d1ecc4b2c2644ce363214c03c6 (patch) | |
| tree | fdf9e4412fdfcbdb7787b31d39bce9b3f64e2670 | |
| parent | 1da105653030d8dafd93c637caeca120258ae8b9 (diff) | |
| download | httpd-10b15a816da1f4d1ecc4b2c2644ce363214c03c6.tar.gz | |
make test cases for mod_tls work, do not clear gen directory on every invocation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1909454 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | test/modules/tls/test_05_proto.py | 7 | ||||
| -rw-r--r-- | test/pyhttpd/env.py | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/modules/tls/test_05_proto.py b/test/modules/tls/test_05_proto.py index c5eea7d956..d874a905ef 100644 --- a/test/modules/tls/test_05_proto.py +++ b/test/modules/tls/test_05_proto.py @@ -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)) diff --git a/test/pyhttpd/env.py b/test/pyhttpd/env.py index 203284469b..0f21e73b7a 100644 --- a/test/pyhttpd/env.py +++ b/test/pyhttpd/env.py @@ -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) |