Merge branch 'test-add_dns01_challenge' into add_dns01_challenge

This commit is contained in:
Wilfried Teiken
2016-01-06 03:13:25 -05:00
3 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -245,7 +245,7 @@ class DNS01Response(KeyAuthorizationChallengeResponse):
from acme import dns_resolver from acme import dns_resolver
txt_records = dns_resolver.txt_records_for_name( txt_records = dns_resolver.txt_records_for_name(
validation_domain_name) validation_domain_name)
except ImportError: except ImportError: # pragma: no cover
raise ImportError("Local validation for 'dns-01' challenges " raise ImportError("Local validation for 'dns-01' challenges "
"requires 'dnspython'") "requires 'dnspython'")
exists = validation in txt_records exists = validation in txt_records
+1 -1
View File
@@ -19,7 +19,7 @@ def txt_records_for_name(name):
""" """
try: try:
dns_response = dns.resolver.query(name, 'TXT') dns_response = dns.resolver.query(name, 'TXT')
except ImportError as error: except ImportError as error: # pragma: no cover
raise ImportError("Local validation for 'dns-01' challenges requires " raise ImportError("Local validation for 'dns-01' challenges requires "
"'dnspython'") "'dnspython'")
except dns.exception.DNSException as error: except dns.exception.DNSException as error:
+4 -4
View File
@@ -15,7 +15,7 @@ envlist = py26,py27,py33,py34,py35,cover,lint
# packages installed separately to ensure that dowstream deps problems # packages installed separately to ensure that dowstream deps problems
# are detected, c.f. #1002 # are detected, c.f. #1002
commands = commands =
pip install -e acme[testing] pip install -e acme[dns,testing]
nosetests -v acme nosetests -v acme
pip install -e .[testing] pip install -e .[testing]
nosetests -v letsencrypt nosetests -v letsencrypt
@@ -33,17 +33,17 @@ setenv =
[testenv:py33] [testenv:py33]
commands = commands =
pip install -e acme[dev,testing] pip install -e acme[dns,testing]
nosetests -v acme nosetests -v acme
[testenv:py34] [testenv:py34]
commands = commands =
pip install -e acme[dev,testing] pip install -e acme[dns,testing]
nosetests -v acme nosetests -v acme
[testenv:py35] [testenv:py35]
commands = commands =
pip install -e acme[dev,testing] pip install -e acme[dns,testing]
nosetests -v acme nosetests -v acme
[testenv:cover] [testenv:cover]