Fix bugs and test cases

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:

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)

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()