upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-08 16:22:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Moving tests for conflicting args to cli_test.py

Browse source
This commit is contained in:
Amjad Mashaal 2016-05-25 23:13:26 +02:00
parent 911b4565be
commit 74f5c85178
2 changed files with 7 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
certbot/tests/cli_test.py
View file

@ -908,6 +908,10 @@ class CLITest(unittest.TestCase): # pylint: disable=too-many-public-methods
self._call(['-c', test_util.vector_path('cli.ini')])
self.assertTrue(mocked_run.called)
def test_conflicting_args(self):
args = ['renew', '--dialog', '--text']
self.assertRaises(errors.Error, self._call, args)
class DetermineAccountTest(unittest.TestCase):
"""Tests for certbot.cli._determine_account."""

39
certbot/tests/main_test.py
View file

@ -1,49 +1,15 @@
"""Tests for certbot.main."""
import os
import shutil
import tempfile
import unittest
import mock
import six
from certbot import cli
from certbot import configuration
from certbot import errors
from certbot import main
from certbot.plugins import disco as plugins_disco
class MainTest(unittest.TestCase):
"""Tests for certbot.main"""
def setUp(self):
self.tmp_dir = tempfile.mkdtemp()
self.config_dir = os.path.join(self.tmp_dir, 'config')
self.work_dir = os.path.join(self.tmp_dir, 'work')
self.logs_dir = os.path.join(self.tmp_dir, 'logs')
self.standard_args = ['--config-dir', self.config_dir,
'--work-dir', self.work_dir,
'--logs-dir', self.logs_dir, '--text']
def tearDown(self):
shutil.rmtree(self.tmp_dir)
def _call(self, args, stdout=None):
"Run the client with output streams mocked out"
args = self.standard_args + args
toy_stdout = stdout if stdout else six.StringIO()
with mock.patch('certbot.main.sys.stdout', new=toy_stdout):
with mock.patch('certbot.main.sys.stderr') as stderr:
ret = main.main(args[:]) # NOTE: parser can alter its args!
return ret, toy_stdout, stderr
def test_args_conflict(self):
args = ['renew', '--dialog', '--text']
self.assertRaises(errors.Error, self._call, args)
class ObtainCertTest(unittest.TestCase):
"""Tests for certbot.main.obtain_cert."""
@ -60,6 +26,7 @@ class ObtainCertTest(unittest.TestCase):
config = configuration.NamespaceConfig(
cli.prepare_and_parse_args(plugins, args))
from certbot import main
with mock.patch('certbot.main._init_le_client') as mock_init:
main.obtain_cert(config, plugins)