From c265fb5fb93c294f907a4a074d6aecc25f445463 Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Mon, 16 Nov 2015 12:46:26 -0800 Subject: [PATCH] Fix bugs and test cases --- letsencrypt/cli.py | 2 -- letsencrypt/client.py | 2 +- letsencrypt/tests/cli_test.py | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py index a36a2ff4b..f9de4d72f 100644 --- a/letsencrypt/cli.py +++ b/letsencrypt/cli.py @@ -141,8 +141,6 @@ def _determine_account(args, config): else: # no account registered yet if args.email is None and not args.register_unsafely_without_email: args.email = display_ops.get_email() - else: - args.email = None def _tos_cb(regr): if args.tos: diff --git a/letsencrypt/client.py b/letsencrypt/client.py index 236a15a34..0ae0e26dd 100644 --- a/letsencrypt/client.py +++ b/letsencrypt/client.py @@ -138,7 +138,7 @@ def perform_registration(acme, config): :returns: the same value as acme.register """ try: - regr = acme.register(messages.NewRegistration.from_data(email=config.email)) + return acme.register(messages.NewRegistration.from_data(email=config.email)) except messages.Error, e: if "MX record" in repr(e): config.namespace.email = display_ops.get_email(more=True, invalid=True) diff --git a/letsencrypt/tests/cli_test.py b/letsencrypt/tests/cli_test.py index 500ff074e..df4f67928 100644 --- a/letsencrypt/tests/cli_test.py +++ b/letsencrypt/tests/cli_test.py @@ -488,7 +488,8 @@ class DetermineAccountTest(unittest.TestCase): """Tests for letsencrypt.cli._determine_account.""" def setUp(self): - self.args = mock.MagicMock(account=None, email=None) + self.args = mock.MagicMock(account=None, email=None, + register_unsafely_without_email=False) self.config = configuration.NamespaceConfig(self.args) self.accs = [mock.MagicMock(id='x'), mock.MagicMock(id='y')] self.account_storage = account.AccountMemoryStorage()