Merge remote-tracking branch 'upstream/master' into 2478

letsencrypt-apache/letsencrypt_apache/tests/augeas_configurator_test.py

@@ -20,7 +20,7 @@ class AugeasConfiguratorTest(util.ApacheTest):
             self.config_path, self.vhost_path, self.config_dir, self.work_dir)
 
         self.vh_truth = util.get_vh_truth(
-            self.temp_dir, "debian_apache_2_4/two_vhost_80")
+            self.temp_dir, "debian_apache_2_4/multiple_vhosts")
 
     def tearDown(self):
         shutil.rmtree(self.config_dir)

letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py

@@ -20,17 +20,17 @@ from letsencrypt_apache import obj
 from letsencrypt_apache.tests import util
 
 
-class TwoVhost80Test(util.ApacheTest):
+class MultipleVhostsTest(util.ApacheTest):
     """Test two standard well-configured HTTP vhosts."""
 
     def setUp(self):  # pylint: disable=arguments-differ
-        super(TwoVhost80Test, self).setUp()
+        super(MultipleVhostsTest, self).setUp()
 
         self.config = util.get_apache_configurator(
             self.config_path, self.vhost_path, self.config_dir, self.work_dir)
         self.config = self.mock_deploy_cert(self.config)
         self.vh_truth = util.get_vh_truth(
-            self.temp_dir, "debian_apache_2_4/two_vhost_80")
+            self.temp_dir, "debian_apache_2_4/multiple_vhosts")
 
     def mock_deploy_cert(self, config):
         """A test for a mock deploy cert"""

letsencrypt-apache/letsencrypt_apache/tests/display_ops_test.py

@@ -20,7 +20,7 @@ class SelectVhostTest(unittest.TestCase):
         zope.component.provideUtility(display_util.FileDisplay(sys.stdout))
         self.base_dir = "/example_path"
         self.vhosts = util.get_vh_truth(
-            self.base_dir, "debian_apache_2_4/two_vhost_80")
+            self.base_dir, "debian_apache_2_4/multiple_vhosts")
 
     @classmethod
     def _call(cls, vhosts):

letsencrypt-apache/letsencrypt_apache/tests/parser_test.py

@@ -193,7 +193,7 @@ class ParserInitTest(util.ApacheTest):
                         "update_runtime_variables"):
             path = os.path.join(
                 self.temp_dir,
-                "debian_apache_2_4/////two_vhost_80/../two_vhost_80/apache2")
+                "debian_apache_2_4/////multiple_vhosts/../multiple_vhosts/apache2")
 
             parser = ApacheParser(self.aug, path,
                                   "/dummy/vhostpath")

letsencrypt-apache/letsencrypt_apache/tests/util.py

@@ -22,9 +22,9 @@ from letsencrypt_apache import obj
 
 class ApacheTest(unittest.TestCase):  # pylint: disable=too-few-public-methods
 
-    def setUp(self, test_dir="debian_apache_2_4/two_vhost_80",
-              config_root="debian_apache_2_4/two_vhost_80/apache2",
-              vhost_root="debian_apache_2_4/two_vhost_80/apache2/sites-available"):
+    def setUp(self, test_dir="debian_apache_2_4/multiple_vhosts",
+              config_root="debian_apache_2_4/multiple_vhosts/apache2",
+              vhost_root="debian_apache_2_4/multiple_vhosts/apache2/sites-available"):
         # pylint: disable=arguments-differ
         super(ApacheTest, self).setUp()
 
@@ -59,9 +59,9 @@ class ApacheTest(unittest.TestCase):  # pylint: disable=too-few-public-methods
 
 class ParserTest(ApacheTest):  # pytlint: disable=too-few-public-methods
 
-    def setUp(self, test_dir="debian_apache_2_4/two_vhost_80",
-              config_root="debian_apache_2_4/two_vhost_80/apache2",
-              vhost_root="debian_apache_2_4/two_vhost_80/apache2/sites-available"):
+    def setUp(self, test_dir="debian_apache_2_4/multiple_vhosts",
+              config_root="debian_apache_2_4/multiple_vhosts/apache2",
+              vhost_root="debian_apache_2_4/multiple_vhosts/apache2/sites-available"):
         super(ParserTest, self).setUp(test_dir, config_root, vhost_root)
 
         zope.component.provideUtility(display_util.FileDisplay(sys.stdout))
@@ -116,7 +116,7 @@ def get_apache_configurator(
 
 def get_vh_truth(temp_dir, config_name):
     """Return the ground truth for the specified directory."""
-    if config_name == "debian_apache_2_4/two_vhost_80":
+    if config_name == "debian_apache_2_4/multiple_vhosts":
         prefix = os.path.join(
             temp_dir, config_name, "apache2/sites-available")
         aug_pre = "/files" + prefix

letsencrypt/client.py

@@ -146,8 +146,7 @@ def perform_registration(acme, config):
     try:
         return acme.register(messages.NewRegistration.from_data(email=config.email))
     except messages.Error as e:
-        err = repr(e)
-        if "MX record" in err or "Validation of contact mailto" in err:
+        if e.typ == "urn:acme:error:invalidEmail":
             config.namespace.email = display_ops.get_email(more=True, invalid=True)
             return perform_registration(acme, config)
         else:

letsencrypt/tests/client_test.py

@@ -63,8 +63,8 @@ class RegisterTest(unittest.TestCase):
     @mock.patch("letsencrypt.client.display_ops.get_email")
     def test_email_retry(self, _rep, mock_get_email):
         from acme import messages
-        msg = "Validation of contact mailto:sousaphone@improbablylongggstring.tld failed"
-        mx_err = messages.Error(detail=msg, typ="malformed", title="title")
+        msg = "DNS problem: NXDOMAIN looking up MX for example.com"
+        mx_err = messages.Error(detail=msg, typ="urn:acme:error:invalidEmail")
         with mock.patch("letsencrypt.client.acme_client.Client") as mock_client:
             mock_client().register.side_effect = [mx_err, mock.MagicMock()]
             self._call()