From 6f25005559ce104a72ff2016438ae57ab249048a Mon Sep 17 00:00:00 2001
From: Amjad Mashaal <me@amjad.io>
Date: Mon, 21 Mar 2016 01:12:59 +0200
Subject: [PATCH] Adding tests

---
 letsencrypt/auth_handler.py            | 7 +++----
 letsencrypt/cli.py                     | 3 +++
 letsencrypt/tests/auth_handler_test.py | 3 +++
 letsencrypt/tests/cli_test.py          | 4 ++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/letsencrypt/auth_handler.py b/letsencrypt/auth_handler.py
index 1d82705b7..284f9affd 100644
--- a/letsencrypt/auth_handler.py
+++ b/letsencrypt/auth_handler.py
@@ -66,7 +66,6 @@ class AuthHandler(object):
 
         self._choose_challenges(domains)
 
-
         # While there are still challenges remaining...
         while self.achalls:
             resp = self._solve_challenges()
@@ -80,11 +79,11 @@ class AuthHandler(object):
 
         # Only return valid authorizations
         retVal = [authzr for authzr in self.authzr.values()
-                if authzr.body.status == messages.STATUS_VALID]
+                  if authzr.body.status == messages.STATUS_VALID]
 
         if len(retVal) <= 0:
-            logger.critical("Challenges failed for all domains")
-            raise
+            raise errors.AuthorizationError(
+                "Challenges failed for all domains")
 
         return retVal
 
diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py
index 2ccff232b..4b3b3860b 100644
--- a/letsencrypt/cli.py
+++ b/letsencrypt/cli.py
@@ -1244,6 +1244,9 @@ class HelpfulArgumentParser(object):
                     parsed_args.register_unsafely_without_email = True
 
         if parsed_args.csr:
+            if parsed_args.allow_subset_of_names:
+                raise errors.Error("--allow-subset-of-names "
+                                   "cannot be used with --csr")
             self.handle_csr(parsed_args)
 
         if self.detect_defaults:  # plumbing
diff --git a/letsencrypt/tests/auth_handler_test.py b/letsencrypt/tests/auth_handler_test.py
index 61dd0e21b..b7ac04984 100644
--- a/letsencrypt/tests/auth_handler_test.py
+++ b/letsencrypt/tests/auth_handler_test.py
@@ -163,6 +163,9 @@ class GetAuthorizationsTest(unittest.TestCase):
         self.assertRaises(
             errors.AuthorizationError, self.handler.get_authorizations, ["0"])
 
+    def test_no_domains(self):
+        self.assertRaises(errors.AuthorizationError, self.handler.get_authorizations, [])
+
     def _validate_all(self, unused_1, unused_2):
         for dom in self.handler.authzr.keys():
             azr = self.handler.authzr[dom]
diff --git a/letsencrypt/tests/cli_test.py b/letsencrypt/tests/cli_test.py
index bfd3818c1..feb70c2e9 100644
--- a/letsencrypt/tests/cli_test.py
+++ b/letsencrypt/tests/cli_test.py
@@ -360,6 +360,10 @@ class CLITest(unittest.TestCase):  # pylint: disable=too-many-public-methods
                           self._call,
                           ['-d', '204.11.231.35'])
 
+    def test_csr_with_besteffort(self):
+        args = ["--csr", CSR, "--allow-subset-of-names"]
+        self.assertRaises(errors.Error, self._call, args)
+
     def test_run_with_csr(self):
         # This is an error because you can only use --csr with certonly
         try: