Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/certbot/certbot.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Warren <bmw@users.noreply.github.com>2018-01-18 02:34:34 +0300
committerGitHub <noreply@github.com>2018-01-18 02:34:34 +0300
commit1bb2cfadf7d18ee01f70ebb3b34cedf356946837 (patch)
treebd6eb87e0a04032771319b548f9a3b78098c2264
parentf43a95e9c123e9c8a83b7836d516bb2126045042 (diff)
hardcode vhosts and names for test (#5444)
-rw-r--r--certbot-apache/certbot_apache/tests/http_01_test.py23
1 files changed, 7 insertions, 16 deletions
diff --git a/certbot-apache/certbot_apache/tests/http_01_test.py b/certbot-apache/certbot_apache/tests/http_01_test.py
index ee8566396..64a76649a 100644
--- a/certbot-apache/certbot_apache/tests/http_01_test.py
+++ b/certbot-apache/certbot_apache/tests/http_01_test.py
@@ -45,28 +45,19 @@ class ApacheHttp01Test(util.ApacheTest):
self.account_key = self.rsa512jwk
self.achalls = []
- self.vhosts = []
- vhost_index = 0
- for i in range(NUM_ACHALLS):
- domain = None
- # Find a vhost with a name/alias we can use
- for j in range(vhost_index + 1, len(self.config.vhosts)):
- vhost = self.config.vhosts[j]
- domain = vhost.name if vhost.name else next(iter(vhost.aliases), None)
- if domain:
- self.vhosts.append(vhost)
- vhost_index = j + 1
- break
- else: # pragma: no cover
- # If we didn't find a domain, we shouldn't continue the test.
- self.fail("No usable vhost found")
+ vh_truth = util.get_vh_truth(
+ self.temp_dir, "debian_apache_2_4/multiple_vhosts")
+ # Takes the vhosts for encryption-example.demo, certbot.demo, and
+ # vhost.in.rootconf
+ self.vhosts = [vh_truth[0], vh_truth[3], vh_truth[10]]
+ for i in range(NUM_ACHALLS):
self.achalls.append(
achallenges.KeyAuthorizationAnnotatedChallenge(
challb=acme_util.chall_to_challb(
challenges.HTTP01(token=((chr(ord('a') + i).encode() * 16))),
"pending"),
- domain=domain, account_key=self.account_key))
+ domain=self.vhosts[i].name, account_key=self.account_key))
modules = ["rewrite", "authz_core", "authz_host"]
for mod in modules: