From 357e8991a363112377eca1d8f4f918d4521663f8 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Mon, 11 Jan 2021 13:59:03 +0100 Subject: [PATCH] dnsdist: Travis' Python 2 does not handle TLS sessions at all --- regression-tests.dnsdist/test_TLS.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/regression-tests.dnsdist/test_TLS.py b/regression-tests.dnsdist/test_TLS.py index 36a5444e23..0f483d6121 100644 --- a/regression-tests.dnsdist/test_TLS.py +++ b/regression-tests.dnsdist/test_TLS.py @@ -160,12 +160,14 @@ class TLSTests(object): sslsock = sslctx.wrap_socket(sock, server_hostname='powerdns.com') sslsock.connect(("127.0.0.1", self._tlsServerPort)) + if not hasattr(sslsock, 'session') or not hasattr(sslsock, 'session_reused'): + self.skipTest('the python ssl library does not have TLS session support') + self.sendTCPQueryOverConnection(sslsock, query, response=None) receivedResponse = self.recvTCPResponseOverConnection(sslsock, useQueue=False) self.assertTrue(receivedResponse) self.assertEquals(expectedResponse, receivedResponse) - if hasattr(sslsock, 'session_reused'): - self.assertFalse(sslsock.session_reused) + self.assertFalse(sslsock.session_reused) session = sslsock.session # this one should not (different SNI) @@ -182,8 +184,7 @@ class TLSTests(object): receivedQuery.id = query.id self.assertEquals(query, receivedQuery) self.assertEquals(response, receivedResponse) - if hasattr(sslsock, 'session_reused'): - self.assertFalse(sslsock.session_reused) + self.assertFalse(sslsock.session_reused) # and now we should be able to resume the session sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) @@ -197,8 +198,7 @@ class TLSTests(object): receivedResponse = self.recvTCPResponseOverConnection(sslsock, useQueue=False) self.assertTrue(receivedResponse) self.assertEquals(expectedResponse, receivedResponse) - if hasattr(sslsock, 'session_reused'): - self.assertTrue(sslsock.session_reused) + self.assertTrue(sslsock.session_reused) class TestOpenSSL(DNSDistTest, TLSTests): -- 2.47.2