From 50cf1e9d1ad2f81d2b84e23307c0ad77d3aa126f Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Thu, 12 Jan 2017 17:45:15 -0800 Subject: [PATCH] Remove 'called_once_with' call (#4041) * Remove 'called_once_with' call * Migrate z_util callers to patch_get_utility --- certbot/plugins/selection_test.py | 7 ++++--- certbot/tests/display/ops_test.py | 30 +++++++++++++++++------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/certbot/plugins/selection_test.py b/certbot/plugins/selection_test.py index c0494e565..eb4db2081 100644 --- a/certbot/plugins/selection_test.py +++ b/certbot/plugins/selection_test.py @@ -6,6 +6,7 @@ import mock import zope.component from certbot.display import util as display_util +from certbot.tests import util as test_util from certbot import interfaces @@ -126,14 +127,14 @@ class ChoosePluginTest(unittest.TestCase): from certbot.plugins.selection import choose_plugin return choose_plugin(self.plugins, "Question?") - @mock.patch("certbot.plugins.selection.z_util") + @test_util.patch_get_utility("certbot.plugins.selection.z_util") def test_selection(self, mock_util): mock_util().menu.side_effect = [(display_util.OK, 0), (display_util.OK, 1)] self.assertEqual(self.mock_stand, self._call()) self.assertEqual(mock_util().notification.call_count, 1) - @mock.patch("certbot.plugins.selection.z_util") + @test_util.patch_get_utility("certbot.plugins.selection.z_util") def test_more_info(self, mock_util): mock_util().menu.side_effect = [ (display_util.HELP, 0), @@ -144,7 +145,7 @@ class ChoosePluginTest(unittest.TestCase): self.assertEqual(self.mock_stand, self._call()) self.assertEqual(mock_util().notification.call_count, 2) - @mock.patch("certbot.plugins.selection.z_util") + @test_util.patch_get_utility("certbot.plugins.selection.z_util") def test_no_choice(self, mock_util): mock_util().menu.return_value = (display_util.CANCEL, 0) self.assertTrue(self._call() is None) diff --git a/certbot/tests/display/ops_test.py b/certbot/tests/display/ops_test.py index c2f5d302f..f6de33a92 100644 --- a/certbot/tests/display/ops_test.py +++ b/certbot/tests/display/ops_test.py @@ -115,17 +115,17 @@ class ChooseAccountTest(unittest.TestCase): from certbot.display import ops return ops.choose_account(accounts) - @mock.patch("certbot.display.ops.z_util") + @test_util.patch_get_utility("certbot.display.ops.z_util") def test_one(self, mock_util): mock_util().menu.return_value = (display_util.OK, 0) self.assertEqual(self._call([self.acc1]), self.acc1) - @mock.patch("certbot.display.ops.z_util") + @test_util.patch_get_utility("certbot.display.ops.z_util") def test_two(self, mock_util): mock_util().menu.return_value = (display_util.OK, 1) self.assertEqual(self._call([self.acc1, self.acc2]), self.acc2) - @mock.patch("certbot.display.ops.z_util") + @test_util.patch_get_utility("certbot.display.ops.z_util") def test_cancel(self, mock_util): mock_util().menu.return_value = (display_util.CANCEL, 1) self.assertTrue(self._call([self.acc1, self.acc2]) is None) @@ -216,12 +216,12 @@ class ChooseNamesTest(unittest.TestCase): self._call(None) self.assertEqual(mock_manual.call_count, 1) - @mock.patch("certbot.display.ops.z_util") + @test_util.patch_get_utility("certbot.display.ops.z_util") def test_no_installer_cancel(self, mock_util): mock_util().input.return_value = (display_util.CANCEL, []) self.assertEqual(self._call(None), []) - @mock.patch("certbot.display.ops.z_util") + @test_util.patch_get_utility("certbot.display.ops.z_util") def test_no_names_choose(self, mock_util): self.mock_install().get_all_names.return_value = set() domain = "example.com" @@ -272,7 +272,7 @@ class ChooseNamesTest(unittest.TestCase): self.assertEqual(_sort_names(to_sort), sortd) - @mock.patch("certbot.display.ops.z_util") + @test_util.patch_get_utility("certbot.display.ops.z_util") def test_filter_names_valid_return(self, mock_util): self.mock_install.get_all_names.return_value = set(["example.com"]) mock_util().checklist.return_value = (display_util.OK, ["example.com"]) @@ -281,14 +281,14 @@ class ChooseNamesTest(unittest.TestCase): self.assertEqual(names, ["example.com"]) self.assertEqual(mock_util().checklist.call_count, 1) - @mock.patch("certbot.display.ops.z_util") + @test_util.patch_get_utility("certbot.display.ops.z_util") def test_filter_names_nothing_selected(self, mock_util): self.mock_install.get_all_names.return_value = set(["example.com"]) mock_util().checklist.return_value = (display_util.OK, []) self.assertEqual(self._call(self.mock_install), []) - @mock.patch("certbot.display.ops.z_util") + @test_util.patch_get_utility("certbot.display.ops.z_util") def test_filter_names_cancel(self, mock_util): self.mock_install.get_all_names.return_value = set(["example.com"]) mock_util().checklist.return_value = ( @@ -307,7 +307,7 @@ class ChooseNamesTest(unittest.TestCase): self.assertEqual(get_valid_domains(all_invalid), []) self.assertEqual(len(get_valid_domains(two_valid)), 2) - @mock.patch("certbot.display.ops.z_util") + @test_util.patch_get_utility("certbot.display.ops.z_util") def test_choose_manually(self, mock_util): from certbot.display.ops import _choose_names_manually # No retry @@ -350,7 +350,7 @@ class SuccessInstallationTest(unittest.TestCase): from certbot.display.ops import success_installation success_installation(names) - @mock.patch("certbot.display.ops.z_util") + @test_util.patch_get_utility("certbot.display.ops.z_util") def test_success_installation(self, mock_util): mock_util().notification.return_value = None names = ["example.com", "abc.com"] @@ -372,7 +372,7 @@ class SuccessRenewalTest(unittest.TestCase): from certbot.display.ops import success_renewal success_renewal(names) - @mock.patch("certbot.display.ops.z_util") + @test_util.patch_get_utility("certbot.display.ops.z_util") def test_success_renewal(self, mock_util): mock_util().notification.return_value = None names = ["example.com", "abc.com"] @@ -393,12 +393,16 @@ class SuccessRevocationTest(unittest.TestCase): from certbot.display.ops import success_revocation success_revocation(path) - @mock.patch("certbot.display.ops.z_util") + @test_util.patch_get_utility("certbot.display.ops.z_util") def test_success_revocation(self, mock_util): mock_util().notification.return_value = None path = "/path/to/cert.pem" self._call(path) - mock_util().notification.assert_called_once() + mock_util().notification.assert_called_once_with( + "Congratulations! You have successfully revoked the certificate " + "that was located at {0}{1}{1}".format( + path, + os.linesep), pause=False) self.assertTrue(path in mock_util().notification.call_args[0][0]) if __name__ == "__main__":