starred/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-02 03:02:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update relevant_values tests

Browse Source
This commit is contained in:
Brad Warren
2016-06-14 13:52:39 -07:00
parent f9d5ecaf6f
commit 261046a2d7
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot/tests/storage_test.py
+23 -27
View File
@@ -11,6 +11,7 @@ import mock
import pytz import pytz
import certbot import certbot
from certbot import cli
from certbot import configuration from certbot import configuration
from certbot import errors from certbot import errors
from certbot.storage import ALL_FOUR from certbot.storage import ALL_FOUR
@@ -517,38 +518,33 @@ class RenewableCertTests(BaseRenewableCertTest):
self.assertFalse(os.path.islink(self.test_rc.version("privkey", 10))) self.assertFalse(os.path.islink(self.test_rc.version("privkey", 10)))
self.assertFalse(os.path.exists(temp_config_file)) self.assertFalse(os.path.exists(temp_config_file))
@mock.patch("certbot.cli.helpful_parser") def _test_relevant_values_common(self, values):
def test_relevant_values(self, mock_parser): option = "rsa_key_size"
mock_parser = mock.Mock(args=["--standalone"], verb="certonly",
defaults={option: cli.flag_default(option)})
from certbot.storage import relevant_values
with mock.patch("certbot.cli.helpful_parser", mock_parser):
return relevant_values(values)
def test_relevant_values(self):
"""Test that relevant_values() can reject an irrelevant value.""" """Test that relevant_values() can reject an irrelevant value."""
# pylint: disable=protected-access self.assertEqual(
from certbot import storage self._test_relevant_values_common({"hello": "there"}), {})
mock_parser.verb = "certonly"
mock_parser.args = ["--standalone"]
mock_action = mock.Mock(dest="rsa_key_size", default=2048)
mock_parser.parser._actions = [mock_action]
self.assertEqual(storage.relevant_values({"hello": "there"}), {})
@mock.patch("certbot.cli.helpful_parser") def test_relevant_values_default(self):
def test_relevant_values_default(self, mock_parser):
"""Test that relevant_values() can reject a default value.""" """Test that relevant_values() can reject a default value."""
# pylint: disable=protected-access option = "rsa_key_size"
from certbot import storage values = {option: cli.flag_default(option)}
mock_parser.args = ["--standalone"] self.assertEqual(self._test_relevant_values_common(values), {})
mock_parser.defaults = {"rsa_key_size": 2048}
mock_parser.verb = "certonly"
self.assertEqual(storage.relevant_values({"rsa_key_size": 2048}), {})
@mock.patch("certbot.cli.helpful_parser") def test_relevant_values_nondefault(self):
def test_relevant_values_nondefault(self, mock_parser):
"""Test that relevant_values() can retain a non-default value.""" """Test that relevant_values() can retain a non-default value."""
# pylint: disable=protected-access values = {"rsa_key_size": 12}
from certbot import storage # A copy is given to _test_relevant_values_common
mock_parser.verb = "certonly" # to make sure values isn't modified by the method
mock_parser.args = ["--standalone"] self.assertEqual(
mock_action = mock.Mock(dest="rsa_key_size", default=2048) self._test_relevant_values_common(values.copy()), values)
mock_parser.parser._actions = [mock_action]
self.assertEqual(storage.relevant_values({"rsa_key_size": 12}),
{"rsa_key_size": 12})
@mock.patch("certbot.storage.relevant_values") @mock.patch("certbot.storage.relevant_values")
def test_new_lineage(self, mock_rv): def test_new_lineage(self, mock_rv):