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

Add tests for existing cert removal and newcert directives

Browse Source
This commit is contained in:
Liam Marshall
2015-11-10 15:54:54 -06:00
parent 30c44ef1e2
commit 1f6ef1f4b1
1 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py
View File

@@ -230,6 +230,38 @@ class TwoVhost80Test(util.ApacheTest):
self.config.enable_site,
obj.VirtualHost("asdf", "afsaf", set(), False, False))
def test_deploy_cert_newssl(self):
self.config = util.get_apache_configurator(
self.config_path, self.config_dir, self.work_dir, version=(2, 4, 16))
self.config.parser.modules.add("ssl_module")
self.config.parser.modules.add("mod_ssl.c")
# Get the default 443 vhost
self.config.assoc["random.demo"] = self.vh_truth[1]
self.config.deploy_cert(
"random.demo", "example/cert.pem", "example/key.pem",
"example/cert_chain.pem", "example/fullchain.pem")
self.config.save()
# Verify ssl_module was enabled.
self.assertTrue(self.vh_truth[1].enabled)
self.assertTrue("ssl_module" in self.config.parser.modules)
loc_cert = self.config.parser.find_dir(
"sslcertificatefile", "example/fullchain.pem", self.vh_truth[1].path)
loc_key = self.config.parser.find_dir(
"sslcertificateKeyfile", "example/key.pem", self.vh_truth[1].path)
# Verify one directive was found in the correct file
self.assertEqual(len(loc_cert), 1)
self.assertEqual(configurator.get_file_path(loc_cert[0]),
self.vh_truth[1].filep)
self.assertEqual(len(loc_key), 1)
self.assertEqual(configurator.get_file_path(loc_key[0]),
self.vh_truth[1].filep)
def test_deploy_cert(self):
self.config.parser.modules.add("ssl_module")
self.config.parser.modules.add("mod_ssl.c")
@@ -347,6 +379,21 @@ class TwoVhost80Test(util.ApacheTest):
self.assertEqual(len(self.config.vhosts), 5)
def test_remove_existing_ssl_directives(self):
# pylint: disable=protected-access
BOGUS_DIRECTIVES = ["SSLCertificateKeyFile", "SSLCertificateChainFile",
"SSLCACertificatePath", "SSLCertificateFile"]
for directive in BOGUS_DIRECTIVES:
self.config.parser.add_dir(self.vh_truth[0].path, directive, ["bogus"])
self.config.save()
self.config._remove_existing_ssl_directives(self.vh_truth[0].path)
self.config.save()
for directive in BOGUS_DIRECTIVES:
self.assertEqual(
self.config.parser.find_dir(directive, None, self.vh_truth[0].path),
[])
def test_make_vhost_ssl_extra_vhs(self):
self.config.aug.match = mock.Mock(return_value=["p1", "p2"])
self.assertRaises(