From d38828751f7eeb24039f4880ef0512e9c68baf4a Mon Sep 17 00:00:00 2001
From: TheNavigat <me@amjad.io>
Date: Fri, 12 Feb 2016 14:45:19 +0200
Subject: [PATCH] Fixing tests

---
 letsencrypt/auth_handler.py      | 2 ++
 letsencrypt/cli.py               | 2 +-
 letsencrypt/client.py            | 9 +++++++--
 letsencrypt/tests/client_test.py | 7 ++++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/letsencrypt/auth_handler.py b/letsencrypt/auth_handler.py
index 4c5d2b869..9afd4f324 100644
--- a/letsencrypt/auth_handler.py
+++ b/letsencrypt/auth_handler.py
@@ -90,6 +90,8 @@ class AuthHandler(object):
 
         my_authzr = self.authzr
 
+        logger.debug("authzr: %s", my_authzr)
+
         returnDomains = []
         #Remove failing domains if best_effort is true
         for domain in domains:
diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py
index 734fc9d51..49b0e53ff 100644
--- a/letsencrypt/cli.py
+++ b/letsencrypt/cli.py
@@ -694,7 +694,7 @@ def obtain_cert(config, plugins, lineage=None):
     if config.csr is not None:
         assert lineage is None, "Did not expect a CSR with a RenewableCert"
         csr, typ = config.actual_csr
-        certr, chain = le_client.obtain_certificate_from_csr(config.domains, csr, typ)
+        certr, chain = le_client.obtain_certificate_from_csr(config.domains, csr, False, typ)
         if config.dry_run:
             logger.info(
                 "Dry run: skipping saving certificate to %s", config.cert_path)
diff --git a/letsencrypt/client.py b/letsencrypt/client.py
index dad5b87ff..c9b094910 100644
--- a/letsencrypt/client.py
+++ b/letsencrypt/client.py
@@ -195,7 +195,7 @@ class Client(object):
         else:
             self.auth_handler = None
 
-    def obtain_certificate_from_csr(self, domains, csr, authzr,
+    def obtain_certificate_from_csr(self, domains, csr, authzr=False,
         typ=OpenSSL.crypto.FILETYPE_ASN1):
         """Obtain certificate.
 
@@ -222,10 +222,15 @@ class Client(object):
 
         logger.debug("CSR: %s, domains: %s", csr, domains)
 
+        if authzr is False:
+            authzr, _ = self.auth_handler.get_authorizations(
+                            domains,
+                            self.config.allow_subset_of_names)
+
         certr = self.acme.request_issuance(
             jose.ComparableX509(
                 OpenSSL.crypto.load_certificate_request(typ, csr.data)),
-            authzr)
+                authzr)
         return certr, self.acme.fetch_chain(certr)
 
     def obtain_certificate(self, domains):
diff --git a/letsencrypt/tests/client_test.py b/letsencrypt/tests/client_test.py
index 395539659..220f60a38 100644
--- a/letsencrypt/tests/client_test.py
+++ b/letsencrypt/tests/client_test.py
@@ -137,9 +137,14 @@ class ClientTest(unittest.TestCase):
             self.assertRaises(errors.ConfigurationError,
                 cli.HelpfulArgumentParser.handle_csr, mock_parser, mock_parsed_args)
 
+            authzr, _ = self.client.auth_handler.get_authorizations(self.eg_domains, False)
+
             self.assertEqual(
                 (mock.sentinel.certr, mock.sentinel.chain),
-                self.client.obtain_certificate_from_csr(self.eg_domains, test_csr))
+                self.client.obtain_certificate_from_csr(
+                    self.eg_domains,
+                    test_csr,
+                    authzr))
             # and that the cert was obtained correctly
             self._check_obtain_certificate()