upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-04 06:15:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Make 42d07d7 more closely follow repo conventions

Browse source
This commit is contained in:
Brad Warren 2017-05-15 15:01:54 -07:00
parent 42d07d756d
commit d467295d2a
2 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
certbot/tests/util_test.py
View file

@ -6,7 +6,6 @@ import shutil
import stat
import unittest
import configargparse
import mock
import six
from six.moves import reload_module # pylint: disable=import-error
@ -369,21 +368,28 @@ class AddDeprecatedArgumentTest(unittest.TestCase):
pass
self.assertTrue("--old-option" not in stdout.getvalue())
def test_when_configargparse_set(self):
'''In configargparse versions < 0.12.0 ACTION_TYPES_THAT_DONT_NEED_A_VALUE is a set.'''
orig = configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE
configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = set()
self._call("--old-option", 1)
self.assertEqual(len(configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE), 1)
configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = orig
def test_set_constant(self):
"""Test when ACTION_TYPES_THAT_DONT_NEED_A_VALUE is a set.
def test_when_configargparse_tuple(self):
'''In configargparse versions >= 0.12.0 ACTION_TYPES_THAT_DONT_NEED_A_VALUE is a tuple.'''
orig = configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE
configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = tuple()
self._call("--old-option", 1)
self.assertEqual(len(configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE), 1)
configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = orig
This variable is a set in configargparse versions < 0.12.0.
"""
self._test_constant_common(set)
def test_tuple_constant(self):
"""Test when ACTION_TYPES_THAT_DONT_NEED_A_VALUE is a tuple.
This variable is a tuple in configargparse versions >= 0.12.0.
"""
self._test_constant_common(tuple)
def _test_constant_common(self, typ):
with mock.patch("certbot.util.configargparse") as mock_configargparse:
mock_configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = typ()
self._call("--old-option", 1)
self.assertEqual(
len(mock_configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE), 1)
class EnforceLeValidity(unittest.TestCase):

5
certbot/util.py
View file

@ -477,9 +477,10 @@ def add_deprecated_argument(add_argument, argument_name, nargs):
sys.stderr.write(
"Use of {0} is deprecated.\n".format(option_string))
# In version 0.12.0 ACTION_TYPES_THAT_DONT_NEED_A_VALUE was changed from a set
# to a tuple.
# In version 0.12.0 ACTION_TYPES_THAT_DONT_NEED_A_VALUE was changed from a
# set to a tuple.
if isinstance(configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE, set):
# pylint: disable=no-member
configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE.add(ShowWarning)
else:
configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE += (ShowWarning,)