From bfd182ae39fac4b11072867acd94ff89f7b44128 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 3 Feb 2016 12:14:49 -0800
Subject: [PATCH] Fix _test_certonly_csr_common (more) properly

---
 letsencrypt/tests/cli_test.py | 40 +++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/letsencrypt/tests/cli_test.py b/letsencrypt/tests/cli_test.py
index 7f20d65df..6b2e6f9f1 100644
--- a/letsencrypt/tests/cli_test.py
+++ b/letsencrypt/tests/cli_test.py
@@ -530,35 +530,35 @@ class CLITest(unittest.TestCase):  # pylint: disable=too-many-public-methods
         self.assertRaises(errors.Error,
                           self._certonly_new_request_common, mock_client)
 
-    def _test_certonly_renewal_common(self, renewal_verb, extra_args=None):
+    @mock.patch('letsencrypt.cli._find_duplicative_certs')
+    def _test_certonly_renewal_common(self, extra_args, mock_fdc):
         cert_path = 'letsencrypt/tests/testdata/cert.pem'
         chain_path = '/etc/letsencrypt/live/foo.bar/fullchain.pem'
         mock_lineage = mock.MagicMock(cert=cert_path, fullchain=chain_path)
         mock_certr = mock.MagicMock()
         mock_key = mock.MagicMock(pem='pem_key')
-        with mock.patch('letsencrypt.cli._treat_as_renewal') as mock_renewal:
-            mock_renewal.return_value = (renewal_verb, mock_lineage)
-            mock_client = mock.MagicMock()
-            mock_client.obtain_certificate.return_value = (mock_certr, 'chain',
-                                                           mock_key, 'csr')
-            with mock.patch('letsencrypt.cli._init_le_client') as mock_init:
-                mock_init.return_value = mock_client
-                get_utility_path = 'letsencrypt.cli.zope.component.getUtility'
-                with mock.patch(get_utility_path) as mock_get_utility:
-                    with mock.patch('letsencrypt.cli.OpenSSL'):
-                        with mock.patch('letsencrypt.cli.crypto_util'):
-                            args = ['-d', 'foo.bar', '-a',
-                                    'standalone', 'certonly']
-                            if extra_args:
-                                args += extra_args
-                            self._call(args)
+        mock_fdc.return_value = (mock_lineage, None)
+        mock_client = mock.MagicMock()
+        mock_client.obtain_certificate.return_value = (mock_certr, 'chain',
+                                                       mock_key, 'csr')
+        with mock.patch('letsencrypt.cli._init_le_client') as mock_init:
+            mock_init.return_value = mock_client
+            get_utility_path = 'letsencrypt.cli.zope.component.getUtility'
+            with mock.patch(get_utility_path) as mock_get_utility:
+                with mock.patch('letsencrypt.cli.OpenSSL'):
+                    with mock.patch('letsencrypt.cli.crypto_util'):
+                        args = ['-d', 'foo.bar', '-a',
+                                'standalone', 'certonly']
+                        if extra_args:
+                            args += extra_args
+                        self._call(args)
 
         mock_client.obtain_certificate.assert_called_once_with(['foo.bar'])
 
         return mock_lineage, mock_get_utility
 
     def test_certonly_renewal(self):
-        lineage, get_utility = self._test_certonly_renewal_common('renew')
+        lineage, get_utility = self._test_certonly_renewal_common([])
         self.assertEqual(lineage.save_successor.call_count, 1)
         lineage.update_all_links_to.assert_called_once_with(
             lineage.latest_common_version())
@@ -567,11 +567,11 @@ class CLITest(unittest.TestCase):  # pylint: disable=too-many-public-methods
         self.assertTrue('donate' in get_utility().add_message.call_args[0][0])
 
     def test_certonly_dry_run_reinstall_is_renewal(self):
-        _, get_utility = self._test_certonly_renewal_common('renew',
-                                                            ['--dry-run'])
+        _, get_utility = self._test_certonly_renewal_common(['--dry-run'])
         self.assertEqual(get_utility().add_message.call_count, 1)
         self.assertTrue('dry run' in get_utility().add_message.call_args[0][0])
 
+
     @mock.patch('letsencrypt.cli.zope.component.getUtility')
     @mock.patch('letsencrypt.cli._treat_as_renewal')
     @mock.patch('letsencrypt.cli._init_le_client')