starred/certbot-certbot-2
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-02 00:22:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

formatting fixes for testing code

Browse Source
This commit is contained in:
James Kasten
2015-02-02 00:47:39 -08:00
parent 2cb4ab936d
commit 4d247fa6a1
1 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/client/tests/auth_handler_test.py
+36 -34
View File
@@ -4,6 +4,7 @@ import unittest
import mock import mock
from letsencrypt.client import challenge_util
from letsencrypt.client import errors from letsencrypt.client import errors
from letsencrypt.client.tests import acme_util from letsencrypt.client.tests import acme_util
@@ -79,8 +80,8 @@ class SatisfyChallengesTest(unittest.TestCase):
self.assertEqual(self.handler.responses[dom][0], "DvsniChall%d" % i) self.assertEqual(self.handler.responses[dom][0], "DvsniChall%d" % i)
self.assertEqual(len(self.handler.dv_c[dom]), 1) self.assertEqual(len(self.handler.dv_c[dom]), 1)
self.assertEqual(len(self.handler.client_c[dom]), 0) self.assertEqual(len(self.handler.client_c[dom]), 0)
self.assertEqual( self.assertTrue(isinstance(self.handler.dv_c[dom][0].chall,
type(self.handler.dv_c[dom][0].chall).__name__, "DvsniChall") challenge_util.DvsniChall))
@mock.patch("letsencrypt.client.auth_handler.gen_challenge_path") @mock.patch("letsencrypt.client.auth_handler.gen_challenge_path")
def test_name1_auth(self, mock_chall_path): def test_name1_auth(self, mock_chall_path):
@@ -108,8 +109,8 @@ class SatisfyChallengesTest(unittest.TestCase):
self.assertEqual(len(self.handler.dv_c[dom]), 1) self.assertEqual(len(self.handler.dv_c[dom]), 1)
self.assertEqual(len(self.handler.client_c[dom]), 0) self.assertEqual(len(self.handler.client_c[dom]), 0)
self.assertEqual( self.assertTrue(isinstance(self.handler.dv_c[dom][0].chall,
type(self.handler.dv_c[dom][0].chall).__name__, "SimpleHttpsChall") challenge_util.SimpleHttpsChall))
@mock.patch("letsencrypt.client.auth_handler.gen_challenge_path") @mock.patch("letsencrypt.client.auth_handler.gen_challenge_path")
def test_name1_all(self, mock_chall_path): def test_name1_all(self, mock_chall_path):
@@ -122,7 +123,7 @@ class SatisfyChallengesTest(unittest.TestCase):
acme_util.get_chall_msg(dom, "nonce0", challenges, combos), acme_util.get_chall_msg(dom, "nonce0", challenges, combos),
"dummy_key") "dummy_key")
path = gen_path(["simpleHttps", "recoveryToken"], challenges) path =gen_path(["simpleHttps", "recoveryToken"], challenges)
mock_chall_path.return_value = path mock_chall_path.return_value = path
self.handler._satisfy_challenges() # pylint: disable=protected-access self.handler._satisfy_challenges() # pylint: disable=protected-access
@@ -137,10 +138,10 @@ class SatisfyChallengesTest(unittest.TestCase):
self.assertEqual( self.assertEqual(
self.handler.responses[dom], self.handler.responses[dom],
self._get_exp_response(dom, path, challenges)) self._get_exp_response(dom, path, challenges))
self.assertEqual( self.assertTrue(isinstance(self.handler.dv_c[dom][0].chall,
type(self.handler.dv_c[dom][0].chall).__name__, "SimpleHttpsChall") challenge_util.SimpleHttpsChall))
self.assertEqual( self.assertTrue(isinstance(self.handler.client_c[dom][0].chall,
type(self.handler.client_c[dom][0].chall).__name__, "RecTokenChall") challenge_util.RecTokenChall))
@mock.patch("letsencrypt.client.auth_handler.gen_challenge_path") @mock.patch("letsencrypt.client.auth_handler.gen_challenge_path")
def test_name5_all(self, mock_chall_path): def test_name5_all(self, mock_chall_path):
@@ -173,11 +174,10 @@ class SatisfyChallengesTest(unittest.TestCase):
self.assertEqual(len(self.handler.dv_c[dom]), 1) self.assertEqual(len(self.handler.dv_c[dom]), 1)
self.assertEqual(len(self.handler.client_c[dom]), 1) self.assertEqual(len(self.handler.client_c[dom]), 1)
self.assertEqual( self.assertTrue(isinstance(self.handler.dv_c[dom][0].chall,
type(self.handler.dv_c[dom][0].chall).__name__, "DvsniChall") challenge_util.DvsniChall))
self.assertEqual( self.assertTrue(isinstance(self.handler.client_c[dom][0].chall,
type(self.handler.client_c[dom][0].chall).__name__, challenge_util.RecContactChall))
"RecContactChall")
@mock.patch("letsencrypt.client.auth_handler.gen_challenge_path") @mock.patch("letsencrypt.client.auth_handler.gen_challenge_path")
def test_name5_mix(self, mock_chall_path): def test_name5_mix(self, mock_chall_path):
@@ -219,21 +219,21 @@ class SatisfyChallengesTest(unittest.TestCase):
self.assertEqual( self.assertEqual(
len(self.handler.client_c[dom]), len(chosen_chall[i]) - 1) len(self.handler.client_c[dom]), len(chosen_chall[i]) - 1)
self.assertEqual( self.assertTrue(isinstance(self.handler.dv_c["0"][0].chall,
type(self.handler.dv_c["0"][0].chall).__name__, "DnsChall") challenge_util.DnsChall))
self.assertEqual( self.assertTrue(isinstance(self.handler.dv_c["1"][0].chall,
type(self.handler.dv_c["1"][0].chall).__name__, "DvsniChall") challenge_util.DvsniChall))
self.assertEqual( self.assertTrue(isinstance(self.handler.dv_c["2"][0].chall,
type(self.handler.dv_c["2"][0].chall).__name__, "SimpleHttpsChall") challenge_util.SimpleHttpsChall))
self.assertEqual( self.assertTrue(isinstance(self.handler.dv_c["3"][0].chall,
type(self.handler.dv_c["3"][0].chall).__name__, "SimpleHttpsChall") challenge_util.SimpleHttpsChall))
self.assertEqual( self.assertTrue(isinstance(self.handler.dv_c["4"][0].chall,
type(self.handler.dv_c["4"][0].chall).__name__, "DnsChall") challenge_util.DnsChall))
self.assertEqual( self.assertTrue(isinstance(self.handler.client_c["2"][0].chall,
type(self.handler.client_c["2"][0].chall).__name__, "PopChall") challenge_util.PopChall))
self.assertEqual( self.assertTrue(isinstance(self.handler.client_c["4"][0].chall,
type(self.handler.client_c["4"][0].chall).__name__, "RecTokenChall") challenge_util.RecTokenChall))
@mock.patch("letsencrypt.client.auth_handler.gen_challenge_path") @mock.patch("letsencrypt.client.auth_handler.gen_challenge_path")
def test_perform_exception_cleanup(self, mock_chall_path): def test_perform_exception_cleanup(self, mock_chall_path):
@@ -251,8 +251,8 @@ class SatisfyChallengesTest(unittest.TestCase):
str(i), "nonce%d" % i, challenges, combos), str(i), "nonce%d" % i, challenges, combos),
"dummy_key") "dummy_key")
path = gen_path(["dvsni", "proofOfPossession"], challenges) mock_chall_path.return_value = gen_path(
mock_chall_path.return_value = path ["dvsni", "proofOfPossession"], challenges)
# This may change in the future... but for now catch the error # This may change in the future... but for now catch the error
self.assertRaises(errors.LetsEncryptAuthHandlerError, self.assertRaises(errors.LetsEncryptAuthHandlerError,
@@ -268,14 +268,16 @@ class SatisfyChallengesTest(unittest.TestCase):
# Assert length of arg list was 1 # Assert length of arg list was 1
arg_chall_list = mock_cleanup_args[i][0][0] arg_chall_list = mock_cleanup_args[i][0][0]
self.assertEqual(len(arg_chall_list), 1) self.assertEqual(len(arg_chall_list), 1)
self.assertEqual(type(arg_chall_list[0]).__name__, "DvsniChall") self.assertTrue(isinstance(arg_chall_list[0],
challenge_util.DvsniChall))
# Check Auth cleanup # Check Auth cleanup
mock_cleanup_args = self.mock_client_auth.cleanup.call_args_list mock_cleanup_args = self.mock_client_auth.cleanup.call_args_list
for i in xrange(3): for i in xrange(3):
arg_chall_list = mock_cleanup_args[i][0][0] arg_chall_list = mock_cleanup_args[i][0][0]
self.assertEqual(len(arg_chall_list), 1) self.assertEqual(len(arg_chall_list), 1)
self.assertEqual(type(arg_chall_list[0]).__name__, "PopChall") self.assertTrue(isinstance(arg_chall_list[0],
challenge_util.PopChall))
def _get_exp_response(self, domain, path, challenges): # pylint: disable=no-self-use def _get_exp_response(self, domain, path, challenges): # pylint: disable=no-self-use
@@ -467,10 +469,10 @@ def gen_auth_resp(chall_list):
def gen_path(str_list, challenges): def gen_path(str_list, challenges):
"""Generate a path for challenge messages """Generate a path for challenge messages
:param list str_list: list of str, challenge message types :param list str_list: challenge message types (:class:`str`)
:param dict challenges: ACME challenge messages :param dict challenges: ACME challenge messages
:return: list of int :return: :class:`list` of :class:`int`
""" """
path = [] path = []