Merge pull request #2493 from TheNavigat/clienttest

More tests for client.py

letsencrypt/tests/client_test.py

@@ -83,6 +83,14 @@ class RegisterTest(unittest.TestCase):
                 self._call()
                 mock_logger.warn.assert_called_once_with(mock.ANY)
 
+    def test_unsupported_error(self):
+        from acme import messages
+        msg = "Test"
+        mx_err = messages.Error(detail=msg, typ="malformed", title="title")
+        with mock.patch("letsencrypt.client.acme_client.Client") as mock_client:
+            mock_client().register.side_effect = [mx_err, mock.MagicMock()]
+            self.assertRaises(messages.Error, self._call)
+
 class ClientTest(unittest.TestCase):
     """Tests for letsencrypt.client.Client."""
 
@@ -119,8 +127,9 @@ class ClientTest(unittest.TestCase):
         self.acme.fetch_chain.assert_called_once_with(mock.sentinel.certr)
 
     # FIXME move parts of this to test_cli.py...
+    @mock.patch("letsencrypt.client.logger")
     @mock.patch("letsencrypt.cli._process_domain")
-    def test_obtain_certificate_from_csr(self, mock_process_domain):
+    def test_obtain_certificate_from_csr(self, mock_process_domain, mock_logger):
         self._mock_obtain_certificate()
         from letsencrypt import cli
         test_csr = le_util.CSR(form="der", file=None, data=CSR_SAN)
@@ -148,6 +157,14 @@ class ClientTest(unittest.TestCase):
             # and that the cert was obtained correctly
             self._check_obtain_certificate()
 
+            # Test for no auth_handler
+            self.client.auth_handler = None
+            self.assertRaises(
+                errors.Error,
+                self.client.obtain_certificate_from_csr,
+                self.eg_domains,
+                test_csr)
+            mock_logger.warning.assert_called_once_with(mock.ANY)
 
     @mock.patch("letsencrypt.client.crypto_util")
     def test_obtain_certificate(self, mock_crypto_util):