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

Revert "Corrected tests to reflect the removal of wildcard domains etc."

Browse Source 
This reverts commit 53a4d0725d.
This commit is contained in:
Joona Hoikkala
2015-12-08 09:05:33 +02:00
parent 51a5d7ceb0
commit d8b83bc478
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ class TwoVhost80Test(util.ApacheTest):
mock_getutility.notification = mock.MagicMock(return_value=True)
names = self.config.get_all_names()
self.assertEqual(names, set(
["letsencrypt.demo", "encryption-example.demo"]))
["letsencrypt.demo", "encryption-example.demo", "ip-172-30-0-17"]))
@mock.patch("zope.component.getUtility")
@mock.patch("letsencrypt_apache.configurator.socket.gethostbyaddr")
@@ -82,7 +82,7 @@ class TwoVhost80Test(util.ApacheTest):
self.config.vhosts.append(vhost)
names = self.config.get_all_names()
self.assertEqual(len(names), 4)
self.assertEqual(len(names), 5)
self.assertTrue("zombo.com" in names)
self.assertTrue("google.com" in names)
self.assertTrue("letsencrypt.demo" in names)
@@ -90,17 +90,10 @@ class TwoVhost80Test(util.ApacheTest):
def test_add_servernames_alias(self):
self.config.parser.add_dir(
self.vh_truth[2].path, "ServerAlias", ["*.le.co"])
self.config.parser.add_dir(
self.vh_truth[0].path, "ServerAlias", ["working.example.com"])
self.config._add_servernames(self.vh_truth[2]) # pylint: disable=protected-access
self.config._add_servernames(self.vh_truth[0]) # pylint: disable=protected-access
self.assertEqual(
self.vh_truth[2].get_names(), set(["*.le.co", "ip-172-30-0-17"]))
self.assertEqual(
self.vh_truth[0].get_names(), set(["working.example.com",
"encryption-example.demo"]))
def test_get_virtual_hosts(self):
"""Make sure all vhosts are being properly found.