From 108b037a8ecbe9de8eb400334245bcad3bb56ed0 Mon Sep 17 00:00:00 2001 From: Joona Hoikkala Date: Wed, 18 Apr 2018 09:50:31 +0300 Subject: [PATCH] Use display util constants instead of hardcoded values in tests --- certbot/tests/cert_manager_test.py | 14 ++++++++------ certbot/tests/display/ops_test.py | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/certbot/tests/cert_manager_test.py b/certbot/tests/cert_manager_test.py index 22127384e..990f0106d 100644 --- a/certbot/tests/cert_manager_test.py +++ b/certbot/tests/cert_manager_test.py @@ -587,7 +587,7 @@ class GetCertnameTest(unittest.TestCase): mock_name.return_value = 'example.com' from certbot import cert_manager prompt = "Which certificate would you" - self.mock_get_utility().menu.return_value = ('ok', 0) + self.mock_get_utility().menu.return_value = (display_util.OK, 0) self.assertEquals( cert_manager.get_certnames( self.config, "verb", allow_multiple=False), ['example.com']) @@ -601,7 +601,7 @@ class GetCertnameTest(unittest.TestCase): mock_name.return_value = 'example.com' from certbot import cert_manager prompt = "custom prompt" - self.mock_get_utility().menu.return_value = ('ok', 0) + self.mock_get_utility().menu.return_value = (display_util.OK, 0) self.assertEquals( cert_manager.get_certnames( self.config, "verb", allow_multiple=False, custom_prompt=prompt), @@ -615,7 +615,7 @@ class GetCertnameTest(unittest.TestCase): mock_files.return_value = ['example.com.conf'] mock_name.return_value = 'example.com' from certbot import cert_manager - self.mock_get_utility().menu.return_value = ('cancel', 0) + self.mock_get_utility().menu.return_value = (display_util.CANCEL, 0) self.assertRaises( errors.Error, cert_manager.get_certnames, @@ -628,7 +628,8 @@ class GetCertnameTest(unittest.TestCase): mock_name.return_value = 'example.com' from certbot import cert_manager prompt = "Which certificate(s) would you" - self.mock_get_utility().checklist.return_value = ('ok', ['example.com']) + self.mock_get_utility().checklist.return_value = (display_util.OK, + ['example.com']) self.assertEquals( cert_manager.get_certnames( self.config, "verb", allow_multiple=True), ['example.com']) @@ -642,7 +643,8 @@ class GetCertnameTest(unittest.TestCase): mock_name.return_value = 'example.com' from certbot import cert_manager prompt = "custom prompt" - self.mock_get_utility().checklist.return_value = ('ok', ['example.com']) + self.mock_get_utility().checklist.return_value = (display_util.OK, + ['example.com']) self.assertEquals( cert_manager.get_certnames( self.config, "verb", allow_multiple=True, custom_prompt=prompt), @@ -657,7 +659,7 @@ class GetCertnameTest(unittest.TestCase): mock_files.return_value = ['example.com.conf'] mock_name.return_value = 'example.com' from certbot import cert_manager - self.mock_get_utility().checklist.return_value = ('cancel', []) + self.mock_get_utility().checklist.return_value = (display_util.CANCEL, []) self.assertRaises( errors.Error, cert_manager.get_certnames, diff --git a/certbot/tests/display/ops_test.py b/certbot/tests/display/ops_test.py index b905230b4..9de8c5e9a 100644 --- a/certbot/tests/display/ops_test.py +++ b/certbot/tests/display/ops_test.py @@ -500,7 +500,7 @@ class ChooseValuesTest(unittest.TestCase): @test_util.patch_get_utility("certbot.display.ops.z_util") def test_choose_names_success(self, mock_util): items = ["first", "second", "third"] - mock_util().checklist.return_value = ('ok', [items[2]]) + mock_util().checklist.return_value = (display_util.OK, [items[2]]) result = self._call(items, None) self.assertEquals(result, [items[2]]) self.assertTrue(mock_util().checklist.called) @@ -510,7 +510,7 @@ class ChooseValuesTest(unittest.TestCase): def test_choose_names_success_question(self, mock_util): items = ["first", "second", "third"] question = "Which one?" - mock_util().checklist.return_value = ('ok', [items[1]]) + mock_util().checklist.return_value = (display_util.OK, [items[1]]) result = self._call(items, question) self.assertEquals(result, [items[1]]) self.assertTrue(mock_util().checklist.called) @@ -520,7 +520,7 @@ class ChooseValuesTest(unittest.TestCase): def test_choose_names_user_cancel(self, mock_util): items = ["first", "second", "third"] question = "Want to cancel?" - mock_util().checklist.return_value = ('cancel', []) + mock_util().checklist.return_value = (display_util.CANCEL, []) result = self._call(items, question) self.assertEquals(result, []) self.assertTrue(mock_util().checklist.called)