upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-05-28 04:34:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pass more tests

Browse source
This commit is contained in:
Erica Portnoy 2018-02-13 18:14:47 -08:00
parent f2fb173359
commit e29ca46422
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
acme/acme/client.py
View file

@ -561,8 +561,8 @@ class ClientV2(ClientBase):
class BackwardsCompatibleClientV2(object):
def __init__(self, net, key, server):
self.directory = messages.Directory.from_json(net.get(server).json())
self.acme_version = self._acme_version_from_directory(self.directory)
directory = messages.Directory.from_json(net.get(server).json())
self.acme_version = self._acme_version_from_directory(directory)
if self.acme_version == 1:
self.client = Client(directory, key=key, net=net)
else:
@ -590,8 +590,8 @@ class BackwardsCompatibleClientV2(object):
return self.client.agree_to_tos(regr)
else:
assert regr is not None
if "terms_of_service_v2" in self.directory.meta:
assess_tos(self.directory.meta.terms_of_service_v2)
if "terms_of_service_v2" in self.client.directory.meta:
assess_tos(self.client.directory.meta.terms_of_service_v2)
regr.update(terms_of_service_agreed=True)
return self.client.new_account(regr)

12
certbot/tests/main_test.py
View file

@ -225,7 +225,7 @@ class RevokeTest(test_util.TempDirTestCase):
'cert_512.pem'))
self.patches = [
mock.patch('acme.client.Client', autospec=True),
mock.patch('acme.client.BackwardsCompatibleClientV2'),
mock.patch('certbot.client.Client'),
mock.patch('certbot.main._determine_account'),
mock.patch('certbot.main.display_ops.success_revocation')
@ -267,7 +267,7 @@ class RevokeTest(test_util.TempDirTestCase):
def test_revoke_with_reason(self, mock_acme_client,
mock_delete_if_appropriate):
mock_delete_if_appropriate.return_value = False
mock_revoke = mock_acme_client.Client().revoke
mock_revoke = mock_acme_client.BackwardsCompatibleClientV2().revoke
expected = []
for reason, code in constants.REVOCATION_REASONS.items():
self._call("--reason " + reason)
@ -674,7 +674,7 @@ class MainTest(test_util.ConfigTestCase): # pylint: disable=too-many-public-met
ua = "bandersnatch"
args += ["--user-agent", ua]
self._call_no_clientmock(args)
acme_net.assert_called_once_with(mock.ANY, verify_ssl=True, user_agent=ua)
acme_net.assert_called_once_with(mock.ANY, account=mock.ANY, verify_ssl=True, user_agent=ua)
@mock.patch('certbot.main.plug_sel.record_chosen_plugins')
@mock.patch('certbot.main.plug_sel.pick_installer')
@ -1263,11 +1263,11 @@ class MainTest(test_util.ConfigTestCase): # pylint: disable=too-many-public-met
self._call_no_clientmock(['--cert-path', SS_CERT_PATH, '--key-path', RSA2048_KEY_PATH,
'--server', server, 'revoke'])
with open(RSA2048_KEY_PATH, 'rb') as f:
mock_acme_client.Client.assert_called_once_with(
server, key=jose.JWK.load(f.read()), net=mock.ANY)
mock_acme_client.BackwardsCompatibleClientV2.assert_called_once_with(
mock.ANY, jose.JWK.load(f.read()), server)
with open(SS_CERT_PATH, 'rb') as f:
cert = crypto_util.pyopenssl_load_certificate(f.read())[0]
mock_revoke = mock_acme_client.Client().revoke
mock_revoke = mock_acme_client.BackwardsCompatibleClientV2().revoke
mock_revoke.assert_called_once_with(
jose.ComparableX509(cert),
mock.ANY)