crypt/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-01-26 07:41:33 +03:00
Code Activity

add test_set_config_dir

Browse Source
This commit is contained in:
Brad Warren
2017-08-10 16:35:21 -07:00
parent 48c5731a6b
commit 290f5b8ce7
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
certbot-postfix/certbot_postfix/installer.py
View File

@@ -433,7 +433,7 @@ class Installer(plugins_common.Plugin):
expected_prefix = name + " ="
if not output.startswith(expected_prefix):
raise errors.PluginError(
"Unexpected output from '{0}'".format(''.join(cmd)))
"Unexpected output from '{0}'".format(' '.join(cmd)))
return output[len(expected_prefix):].strip()

22
certbot-postfix/certbot_postfix/installer_test.py
View File

@@ -55,6 +55,25 @@ class InstallerTest(certbot_test_util.TempDirTestCase):
with mock.patch(exe_exists_path, return_value=False):
self.assertRaises(errors.NoInstallationError, installer.prepare)
def test_set_config_dir(self):
self.config.postfix_config_dir = os.path.join(self.tempdir, "subdir")
os.mkdir(self.config.postfix_config_dir)
self._write_config(names_only_config)
installer = self._create_installer()
expected = self.config.postfix_config_dir
self.config.postfix_config_dir = None
check_output_path = "certbot_postfix.installer.util.check_output"
exe_exists_path = "certbot_postfix.installer.certbot_util.exe_exists"
with mock.patch(check_output_path) as mock_check_output:
mock_check_output.side_effect = [
"config_directory = " + expected, "mail_version = 3.1.4"
]
with mock.patch(exe_exists_path, return_value=True):
installer.prepare()
self.assertEqual(installer.config_dir, expected)
def test_get_all_names(self):
sorted_names = ['fubard.org', 'mail.fubard.org']
self._write_config(names_only_config)
@@ -75,7 +94,8 @@ class InstallerTest(certbot_test_util.TempDirTestCase):
self.assertEqual([], installer.get_all_certs_keys())
def _write_config(self, content):
with open(os.path.join(self.tempdir, "main.cf"), "w") as f:
config_dir = self.config.postfix_config_dir
with open(os.path.join(config_dir, "main.cf"), "w") as f:
f.write(content)
def test_get_config_var_success(self):