From 8a75898356806784caf742e8277ef03de830ce11 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 2 Dec 2022 05:49:49 -0800 Subject: Make some handshakes in tests less flaky. (#1163) --- tests/test_ssl.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/tests/test_ssl.py b/tests/test_ssl.py index 6fe1c1a..a3617c7 100644 --- a/tests/test_ssl.py +++ b/tests/test_ssl.py @@ -7,6 +7,7 @@ Unit tests for :mod:`OpenSSL.SSL`. import datetime import gc +import select import sys import uuid from errno import ( @@ -1297,20 +1298,20 @@ class TestContext: """ serverSocket, clientSocket = socket_pair() - server = Connection(serverContext, serverSocket) - server.set_accept_state() + with serverSocket, clientSocket: + server = Connection(serverContext, serverSocket) + server.set_accept_state() - client = Connection(clientContext, clientSocket) - client.set_connect_state() + client = Connection(clientContext, clientSocket) + client.set_connect_state() - # Make them talk to each other. - # interact_in_memory(client, server) - for _ in range(3): - for s in [client, server]: - try: - s.do_handshake() - except WantReadError: - pass + # Make them talk to each other. + for _ in range(3): + for s in [client, server]: + try: + s.do_handshake() + except WantReadError: + select.select([client, server], [], []) def test_set_verify_callback_connection_argument(self): """ -- cgit v1.2.1