From a80f045e3b4a44004b21064ca987262232138c73 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 17 Jun 2015 13:09:27 +0530 Subject: [PATCH] Speed up ssl test by avoiding an extra server creation --- src/calibre/srv/tests/loop.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/srv/tests/loop.py b/src/calibre/srv/tests/loop.py index cdc20bcd46..d836f58346 100644 --- a/src/calibre/srv/tests/loop.py +++ b/src/calibre/srv/tests/loop.py @@ -175,8 +175,9 @@ class LoopTest(BaseTest): @skipIf(create_server_cert is None, 'certgen module not available') def test_ssl(self): 'Test serving over SSL' - with TestServer(lambda data:(data.path[0] + data.read())) as server: - address = server.address[0] + s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM, 0) + s.bind(('localhost', 0)) + address = s.getsockname()[0] with TemporaryDirectory('srv-test-ssl') as tdir: cert_file, key_file, ca_file = map(lambda x:os.path.join(tdir, x), 'cka') create_server_cert(address, ca_file, cert_file, key_file, key_size=1024)