fix: don't reload cert manager, use only sni callback
This commit is contained in:
+3
-26
@@ -65,44 +65,21 @@ class TestStaplerServer(BaseTestCase):
|
||||
self.assertEqual(self.server.run(), 0)
|
||||
self.token_manager.detect_file_change.assert_called_once()
|
||||
|
||||
def test_run_https_fail(self) -> None:
|
||||
self.token_manager.detect_file_change.side_effect = KeyboardInterrupt
|
||||
with (
|
||||
self.mock_call(self.registry.load_pages),
|
||||
self.mock_call(self.registry.get_hosts, [], []),
|
||||
self.mock_call(self.cert_manager.init, [["localhost"]]),
|
||||
self.mock_call(self.data_dir.init),
|
||||
self.mock_call(self.token_manager.init),
|
||||
self.mock_call(self.cert_manager.get_https_context, ["localhost"]),
|
||||
self.patch("http.server.ThreadingHTTPServer", self.server_mock),
|
||||
self.mock_call(self.server_mock.serve_forever),
|
||||
self.seal_mocks(),
|
||||
):
|
||||
self.assertEqual(self.server.run(), 0)
|
||||
self.token_manager.detect_file_change.assert_called_once()
|
||||
|
||||
def test_run_https(self) -> None:
|
||||
self.token_manager.detect_file_change.side_effect = KeyboardInterrupt
|
||||
self.cert_manager.detect_default_cert_change.side_effect = KeyboardInterrupt
|
||||
self.cert_manager.sni_callback = unittest.mock.Mock()
|
||||
with (
|
||||
self.mock_call(self.registry.load_pages),
|
||||
self.mock_call(self.registry.get_hosts, [], []),
|
||||
self.mock_call(self.cert_manager.init, [["localhost"]]),
|
||||
self.mock_call(self.data_dir.init),
|
||||
self.mock_call(self.token_manager.init),
|
||||
self.mock_call(
|
||||
self.cert_manager.get_https_context,
|
||||
["localhost"],
|
||||
self.context_mock,
|
||||
),
|
||||
self.patch("ssl.create_default_context", return_value=self.context_mock),
|
||||
self.patch("http.server.ThreadingHTTPServer", self.server_mock, 2),
|
||||
self.mock_call_unchecked(self.context_mock.wrap_socket),
|
||||
self.mock_calls_unchecked(self.server_mock.serve_forever, 2),
|
||||
self.mock_call(self.server_mock.shutdown),
|
||||
self.seal_mocks(self.context_mock),
|
||||
self.seal_mocks(),
|
||||
):
|
||||
self.assertEqual(self.server.run(), 0)
|
||||
self.token_manager.detect_file_change.assert_called_once()
|
||||
self.cert_manager.detect_default_cert_change.assert_called_once_with(
|
||||
"localhost"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user