From 2912a9f99b23c7aadaba87ed7dfd125d121c481c Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Mon, 2 Feb 2015 18:07:00 +0000 Subject: [PATCH] Organize imports (move to the top) --- letsencrypt/client/tests/apache/dvsni_test.py | 3 +- .../client/tests/client_authenticator_test.py | 36 ++++++++----------- .../client/tests/recovery_token_test.py | 19 +++++----- 3 files changed, 26 insertions(+), 32 deletions(-) diff --git a/letsencrypt/client/tests/apache/dvsni_test.py b/letsencrypt/client/tests/apache/dvsni_test.py index 7fbce9cbb..fee93eb1a 100644 --- a/letsencrypt/client/tests/apache/dvsni_test.py +++ b/letsencrypt/client/tests/apache/dvsni_test.py @@ -10,6 +10,8 @@ from letsencrypt.client import challenge_util from letsencrypt.client import constants from letsencrypt.client import le_util +from letsencrypt.client.apache.obj import Addr + from letsencrypt.client.tests.apache import util @@ -134,7 +136,6 @@ class DvsniPerformTest(util.ApacheTest): self.assertEqual(responses[i]["s"], "randomS%d" % i) def test_mod_config(self): - from letsencrypt.client.apache.obj import Addr for chall in self.challs: self.sni.add_chall(chall) v_addr1 = [Addr(("1.2.3.4", "443")), Addr(("5.6.7.8", "443"))] diff --git a/letsencrypt/client/tests/client_authenticator_test.py b/letsencrypt/client/tests/client_authenticator_test.py index b2eff7d28..d5620af02 100644 --- a/letsencrypt/client/tests/client_authenticator_test.py +++ b/letsencrypt/client/tests/client_authenticator_test.py @@ -3,6 +3,9 @@ import unittest import mock +from letsencrypt.client import challenge_util +from letsencrypt.client import errors + class PerformTest(unittest.TestCase): """Test client perform function.""" @@ -16,18 +19,14 @@ class PerformTest(unittest.TestCase): name="rec_token_perform", side_effect=gen_client_resp) def test_rec_token1(self): - from letsencrypt.client.challenge_util import RecTokenChall - token = RecTokenChall("0") - + token = challenge_util.RecTokenChall("0") responses = self.auth.perform([token]) - self.assertEqual(responses, ["RecTokenChall0"]) def test_rec_token5(self): - from letsencrypt.client.challenge_util import RecTokenChall tokens = [] for i in range(5): - tokens.append(RecTokenChall(str(i))) + tokens.append(challenge_util.RecTokenChall(str(i))) responses = self.auth.perform(tokens) @@ -36,13 +35,11 @@ class PerformTest(unittest.TestCase): self.assertEqual(responses[i], "RecTokenChall%d" % i) def test_unexpected(self): - from letsencrypt.client.challenge_util import DvsniChall - from letsencrypt.client.errors import LetsEncryptClientAuthError - - unexpected = DvsniChall("0", "rb64", "123", "invalid_key") + unexpected = challenge_util.DvsniChall( + "0", "rb64", "123", "invalid_key") self.assertRaises( - LetsEncryptClientAuthError, self.auth.perform, [unexpected]) + errors.LetsEncryptClientAuthError, self.auth.perform, [unexpected]) class CleanupTest(unittest.TestCase): @@ -57,9 +54,8 @@ class CleanupTest(unittest.TestCase): self.auth.rec_token.cleanup = self.mock_cleanup def test_rec_token2(self): - from letsencrypt.client.challenge_util import RecTokenChall - token1 = RecTokenChall("0") - token2 = RecTokenChall("1") + token1 = challenge_util.RecTokenChall("0") + token2 = challenge_util.RecTokenChall("1") self.auth.cleanup([token1, token2]) @@ -67,15 +63,11 @@ class CleanupTest(unittest.TestCase): [mock.call(token1), mock.call(token2)]) def test_unexpected(self): - from letsencrypt.client.challenge_util import DvsniChall - from letsencrypt.client.challenge_util import RecTokenChall - from letsencrypt.client.errors import LetsEncryptClientAuthError + token = challenge_util.RecTokenChall("0") + unexpected = challenge_util.DvsniChall("0", "rb64", "123", "dummy_key") - token = RecTokenChall("0") - unexpected = DvsniChall("0", "rb64", "123", "dummy_key") - - self.assertRaises( - LetsEncryptClientAuthError, self.auth.cleanup, [token, unexpected]) + self.assertRaises(errors.LetsEncryptClientAuthError, + self.auth.cleanup, [token, unexpected]) def gen_client_resp(chall): diff --git a/letsencrypt/client/tests/recovery_token_test.py b/letsencrypt/client/tests/recovery_token_test.py index d3d82e8ad..2476b0c34 100644 --- a/letsencrypt/client/tests/recovery_token_test.py +++ b/letsencrypt/client/tests/recovery_token_test.py @@ -6,6 +6,8 @@ import tempfile import mock +from letsencrypt.client import challenge_util + class RecoveryTokenTest(unittest.TestCase): def setUp(self): @@ -31,32 +33,31 @@ class RecoveryTokenTest(unittest.TestCase): self.assertTrue(self.rec_token.requires_human("example3.com")) def test_cleanup(self): - from letsencrypt.client.challenge_util import RecTokenChall self.rec_token.store_token("example3.com", 333) self.assertFalse(self.rec_token.requires_human("example3.com")) - self.rec_token.cleanup(RecTokenChall("example3.com")) + self.rec_token.cleanup(challenge_util.RecTokenChall("example3.com")) self.assertTrue(self.rec_token.requires_human("example3.com")) # Shouldn't throw an error - self.rec_token.cleanup(RecTokenChall("example4.com")) + self.rec_token.cleanup(challenge_util.RecTokenChall("example4.com")) def test_perform_stored(self): - from letsencrypt.client.challenge_util import RecTokenChall self.rec_token.store_token("example4.com", 444) - response = self.rec_token.perform(RecTokenChall("example4.com")) + response = self.rec_token.perform( + challenge_util.RecTokenChall("example4.com")) self.assertEqual(response, {"type": "recoveryToken", "token": "444"}) @mock.patch("letsencrypt.client.recovery_token.zope.component.getUtility") def test_perform_not_stored(self, mock_input): - from letsencrypt.client.challenge_util import RecTokenChall - mock_input().generic_input.side_effect = [(0, "555"), (1, "000")] - response = self.rec_token.perform(RecTokenChall("example5.com")) + response = self.rec_token.perform( + challenge_util.RecTokenChall("example5.com")) self.assertEqual(response, {"type": "recoveryToken", "token": "555"}) - response = self.rec_token.perform(RecTokenChall("example6.com")) + response = self.rec_token.perform( + challenge_util.RecTokenChall("example6.com")) self.assertTrue(response is None)