starred/certbot-certbot-1
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-02 19:42:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add test to prevent regressions of #4183 (#5134)

Browse Source
This commit is contained in:
Joona Hoikkala
2017-09-27 15:51:28 -07:00
committed by Brad Warren
parent 7412099567
commit ba84b7ab49
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot-apache/certbot_apache/tests/configurator_test.py
+2 -2
View File
@@ -172,7 +172,7 @@ class MultipleVhostsTest(util.ApacheTest):
def test_get_aug_internal_path(self): def test_get_aug_internal_path(self):
from certbot_apache.configurator import get_internal_aug_path from certbot_apache.configurator import get_internal_aug_path
internal_paths = [ internal_paths = [
"VirtualHost", "IfModule/VirtualHost", "VirtualHost", "VirtualHost", "Virtualhost", "IfModule/VirtualHost", "VirtualHost", "VirtualHost",
"Macro/VirtualHost", "IfModule/VirtualHost", "VirtualHost", "Macro/VirtualHost", "IfModule/VirtualHost", "VirtualHost",
"IfModule/VirtualHost"] "IfModule/VirtualHost"]
@@ -755,7 +755,7 @@ class MultipleVhostsTest(util.ApacheTest):
"encryption-example-le-ssl.conf")) "encryption-example-le-ssl.conf"))
self.assertEqual(ssl_vhost.path, self.assertEqual(ssl_vhost.path,
"/files" + ssl_vhost.filep + "/IfModule/VirtualHost") "/files" + ssl_vhost.filep + "/IfModule/Virtualhost")
self.assertEqual(len(ssl_vhost.addrs), 1) self.assertEqual(len(ssl_vhost.addrs), 1)
self.assertEqual(set([obj.Addr.fromstring("*:443")]), ssl_vhost.addrs) self.assertEqual(set([obj.Addr.fromstring("*:443")]), ssl_vhost.addrs)
self.assertEqual(ssl_vhost.name, "encryption-example.demo") self.assertEqual(ssl_vhost.name, "encryption-example.demo")
certbot-apache/certbot_apache/tests/testdata/debian_apache_2_4/multiple_vhosts/apache2/sites-available/encryption-example.conf
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
<VirtualHost *:80> <Virtualhost *:80>
ServerName encryption-example.demo ServerName encryption-example.demo
ServerAdmin webmaster@localhost ServerAdmin webmaster@localhost
@@ -39,4 +39,4 @@
Allow from 127.0.0.0/255.0.0.0 ::1/128 Allow from 127.0.0.0/255.0.0.0 ::1/128
</Directory> </Directory>
</VirtualHost> </Virtualhost>
certbot-apache/certbot_apache/tests/util.py
+1 -1
View File
@@ -124,7 +124,7 @@ def get_vh_truth(temp_dir, config_name):
vh_truth = [ vh_truth = [
obj.VirtualHost( obj.VirtualHost(
os.path.join(prefix, "encryption-example.conf"), os.path.join(prefix, "encryption-example.conf"),
os.path.join(aug_pre, "encryption-example.conf/VirtualHost"), os.path.join(aug_pre, "encryption-example.conf/Virtualhost"),
set([obj.Addr.fromstring("*:80")]), set([obj.Addr.fromstring("*:80")]),
False, True, "encryption-example.demo"), False, True, "encryption-example.demo"),
obj.VirtualHost( obj.VirtualHost(