starred/certbot-certbot-1
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-07-30 18:14:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate use of Python 2.7-specific unittest features

Browse Source
This commit is contained in:
Seth Schoen
2015-02-08 21:04:54 -08:00
parent 58ba7095f3
commit 3453db0985
1 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/client/tests/standalone_authenticator_test.py
+29 -34
View File
@@ -61,14 +61,10 @@ class PackAndUnpackTests(unittest.TestCase):
def test_invalid_pack_and_unpack(self): def test_invalid_pack_and_unpack(self):
from letsencrypt.client.standalone_authenticator import \ from letsencrypt.client.standalone_authenticator import \
unpack_2bytes, unpack_3bytes, pack_2bytes, pack_3bytes unpack_2bytes, unpack_3bytes, pack_2bytes, pack_3bytes
with self.assertRaises(AssertionError): self.assertRaises(AssertionError, pack_2bytes, 65537)
pack_2bytes(65537) self.assertRaises(AssertionError, pack_3bytes, 500000000)
with self.assertRaises(AssertionError): self.assertRaises(AssertionError, unpack_2bytes, "foo")
pack_3bytes(500000000) self.assertRaises(AssertionError, unpack_3bytes, "food")
with self.assertRaises(AssertionError):
unpack_2bytes("foo")
with self.assertRaises(AssertionError):
unpack_3bytes("food")
class TLSParseClientHelloTest(unittest.TestCase): class TLSParseClientHelloTest(unittest.TestCase):
@@ -187,7 +183,7 @@ class SNICallbackTest(unittest.TestCase):
self.authenticator.sni_callback(connection) self.authenticator.sni_callback(connection)
self.assertEqual(connection.set_context.call_count, 1) self.assertEqual(connection.set_context.call_count, 1)
called_ctx = connection.set_context.call_args[0][0] called_ctx = connection.set_context.call_args[0][0]
self.assertIsInstance(called_ctx, OpenSSL.SSL.Context) self.assertTrue(isinstance(called_ctx, OpenSSL.SSL.Context))
def test_fake_servername(self): def test_fake_servername(self):
"""Test the behavior of the SNI callback when an unexpected SNI """Test the behavior of the SNI callback when an unexpected SNI
@@ -203,7 +199,7 @@ class SNICallbackTest(unittest.TestCase):
self.authenticator.sni_callback(connection) self.authenticator.sni_callback(connection)
self.assertEqual(connection.set_context.call_count, 1) self.assertEqual(connection.set_context.call_count, 1)
called_ctx = connection.set_context.call_args[0][0] called_ctx = connection.set_context.call_args[0][0]
self.assertIsInstance(called_ctx, OpenSSL.SSL.Context) self.assertTrue(isinstance(called_ctx, OpenSSL.SSL.Context))
class ClientSignalHandlerTest(unittest.TestCase): class ClientSignalHandlerTest(unittest.TestCase):
"""Tests for client_signal_handler() method.""" """Tests for client_signal_handler() method."""
@@ -230,8 +226,9 @@ class ClientSignalHandlerTest(unittest.TestCase):
# specified (which can't occur in normal use because this # specified (which can't occur in normal use because this
# function is only set as a signal handler for the above three # function is only set as a signal handler for the above three
# signals). # signals).
with self.assertRaises(AssertionError): self.assertRaises(AssertionError,
self.authenticator.client_signal_handler(signal.SIGPIPE, None) self.authenticator.client_signal_handler,
signal.SIGPIPE, None)
class SubprocSignalHandlerTest(unittest.TestCase): class SubprocSignalHandlerTest(unittest.TestCase):
@@ -311,10 +308,10 @@ class PerformTest(unittest.TestCase):
self.authenticator.tasks.has_key("foononce.acme.invalid")) self.authenticator.tasks.has_key("foononce.acme.invalid"))
self.assertTrue( self.assertTrue(
self.authenticator.tasks.has_key("barnonce.acme.invalid")) self.authenticator.tasks.has_key("barnonce.acme.invalid"))
self.assertIsInstance(result, list) self.assertTrue(isinstance(result, list))
self.assertEqual(len(result), 3) self.assertEqual(len(result), 3)
self.assertIsInstance(result[0], dict) self.assertTrue(isinstance(result[0], dict))
self.assertIsInstance(result[1], dict) self.assertTrue(isinstance(result[1], dict))
self.assertFalse(result[2]) self.assertFalse(result[2])
self.assertTrue(result[0].has_key("s")) self.assertTrue(result[0].has_key("s"))
self.assertTrue(result[1].has_key("s")) self.assertTrue(result[1].has_key("s"))
@@ -337,7 +334,7 @@ class PerformTest(unittest.TestCase):
self.authenticator.tasks.has_key("foononce.acme.invalid")) self.authenticator.tasks.has_key("foononce.acme.invalid"))
self.assertTrue( self.assertTrue(
self.authenticator.tasks.has_key("barnonce.acme.invalid")) self.authenticator.tasks.has_key("barnonce.acme.invalid"))
self.assertIsInstance(result, list) self.assertTrue(isinstance(result, list))
self.assertEqual(len(result), 3) self.assertEqual(len(result), 3)
self.assertEqual(result, [None, None, False]) self.assertEqual(result, [None, None, False])
self.authenticator.start_listener.assert_called_once_with(443, key) self.authenticator.start_listener.assert_called_once_with(443, key)
@@ -345,20 +342,19 @@ class PerformTest(unittest.TestCase):
def test_perform_with_pending_tasks(self): def test_perform_with_pending_tasks(self):
self.authenticator.tasks = {"foononce.acme.invalid": "cert_data"} self.authenticator.tasks = {"foononce.acme.invalid": "cert_data"}
extra_challenge = DvsniChall("a", "b", "c", "d") extra_challenge = DvsniChall("a", "b", "c", "d")
with self.assertRaises(Exception): self.assertRaises(Exception, self.authenticator.perform,
self.authenticator.perform([extra_challenge]) [extra_challenge])
def test_perform_without_challenge_list(self): def test_perform_without_challenge_list(self):
extra_challenge = DvsniChall("a", "b", "c", "d") extra_challenge = DvsniChall("a", "b", "c", "d")
# This is wrong because a challenge must be specified. # This is wrong because a challenge must be specified.
with self.assertRaises(Exception): self.assertRaises(Exception, self.authenticator.perform, [])
self.authenticator.perform([])
# This is wrong because it must be a list, not a bare challenge. # This is wrong because it must be a list, not a bare challenge.
with self.assertRaises(Exception): self.assertRaises(Exception, self.authenticator.perform,
self.authenticator.perform(extra_challenge) extra_challenge)
# This is wrong because the list must contain at least one challenge. # This is wrong because the list must contain at least one challenge.
with self.assertRaises(Exception): self.assertRaises(Exception, self.authenticator.perform,
self.authenticator.perform(range(20)) range(20))
class StartListenerTest(unittest.TestCase): class StartListenerTest(unittest.TestCase):
@@ -481,8 +477,8 @@ class DoChildProcessTest(unittest.TestCase):
# (Just replacing it with a no-op causes logic errors because the # (Just replacing it with a no-op causes logic errors because the
# do_child_process code assumes that calling sys.exit() will # do_child_process code assumes that calling sys.exit() will
# cause subsequent code not to be executed.) # cause subsequent code not to be executed.)
with self.assertRaises(IndentationError): self.assertRaises(IndentationError,
self.authenticator.do_child_process(1717, self.key) self.authenticator.do_child_process, 1717, self.key)
mock_exit.assert_called_once_with(1) mock_exit.assert_called_once_with(1)
mock_kill.assert_called_once_with(12345, signal.SIGUSR2) mock_kill.assert_called_once_with(12345, signal.SIGUSR2)
@@ -497,8 +493,8 @@ class DoChildProcessTest(unittest.TestCase):
sample_socket = mock.MagicMock() sample_socket = mock.MagicMock()
sample_socket.bind.side_effect = eaccess sample_socket.bind.side_effect = eaccess
mock_socket.return_value = sample_socket mock_socket.return_value = sample_socket
with self.assertRaises(IndentationError): self.assertRaises(IndentationError,
self.authenticator.do_child_process(1717, self.key) self.authenticator.do_child_process, 1717, self.key)
mock_exit.assert_called_once_with(1) mock_exit.assert_called_once_with(1)
mock_kill.assert_called_once_with(12345, signal.SIGUSR1) mock_kill.assert_called_once_with(12345, signal.SIGUSR1)
@@ -513,8 +509,8 @@ class DoChildProcessTest(unittest.TestCase):
sample_socket = mock.MagicMock() sample_socket = mock.MagicMock()
sample_socket.bind.side_effect = eio sample_socket.bind.side_effect = eio
mock_socket.return_value = sample_socket mock_socket.return_value = sample_socket
with self.assertRaises(socket.error): self.assertRaises(socket.error,
self.authenticator.do_child_process(1717, self.key) self.authenticator.do_child_process, 1717, self.key)
@mock.patch("letsencrypt.client.standalone_authenticator." @mock.patch("letsencrypt.client.standalone_authenticator."
"OpenSSL.SSL.Connection") "OpenSSL.SSL.Connection")
@@ -527,8 +523,8 @@ class DoChildProcessTest(unittest.TestCase):
sample_socket.accept.side_effect = SocketAcceptOnlyNTimes(2) sample_socket.accept.side_effect = SocketAcceptOnlyNTimes(2)
mock_socket.return_value = sample_socket mock_socket.return_value = sample_socket
mock_connection.return_value = mock.MagicMock() mock_connection.return_value = mock.MagicMock()
with self.assertRaises(CallableExhausted): self.assertRaises(CallableExhausted,
self.authenticator.do_child_process(1717, self.key) self.authenticator.do_child_process, 1717, self.key)
mock_socket.assert_called_once_with() mock_socket.assert_called_once_with()
sample_socket.bind.assert_called_once_with(("0.0.0.0", 1717)) sample_socket.bind.assert_called_once_with(("0.0.0.0", 1717))
sample_socket.listen.assert_called_once_with(1) sample_socket.listen.assert_called_once_with(1)
@@ -561,8 +557,7 @@ class CleanupTest(unittest.TestCase):
def test_bad_cleanup(self): def test_bad_cleanup(self):
chall = DvsniChall("bad.example.com", "whee", "badnonce", "key") chall = DvsniChall("bad.example.com", "whee", "badnonce", "key")
with self.assertRaises(ValueError): self.assertRaises(ValueError, self.authenticator.cleanup, [chall])
self.authenticator.cleanup([chall])
if __name__ == '__main__': if __name__ == '__main__':