From 5a65ae3d94271a3323eec014b304b01535c9526f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 16 May 2017 16:22:03 +0530 Subject: [PATCH] certgen should be always available (I think) --- src/calibre/srv/tests/loop.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/calibre/srv/tests/loop.py b/src/calibre/srv/tests/loop.py index c04430733c..6837662b2e 100644 --- a/src/calibre/srv/tests/loop.py +++ b/src/calibre/srv/tests/loop.py @@ -12,14 +12,10 @@ from unittest import skipIf from glob import glob from threading import Event -try: - from calibre.utils.certgen import create_server_cert -except ImportError: - create_server_cert = None - from calibre.srv.pre_activated import has_preactivated_support from calibre.srv.tests.base import BaseTest, TestServer from calibre.ptempfile import TemporaryDirectory +from calibre.utils.certgen import create_server_cert from calibre.utils.monotonic import monotonic is_ci = os.environ.get('CI', '').lower() == 'true' @@ -187,7 +183,6 @@ class LoopTest(BaseTest): set(b'123456\n7', 4, 2, READ) self.ae(buf.readline(), b'56\n') - @skipIf(create_server_cert is None, 'certgen module not available') def test_ssl(self): 'Test serving over SSL' address = '127.0.0.1'