From: Martin Panter <vadmium+py@gmail.com>
Date: Thu, 14 Jul 2016 01:31:46 +0000 (+0000)
Subject: Issue #27369: Don’t test error message detail that changed in Expat 2.2.0
X-Git-Tag: 3.2^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=076ca6c3c8df3030307e548d9be792ce3c1c6eea;p=thirdparty%2FPython%2Fcpython.git

Issue #27369: Don’t test error message detail that changed in Expat 2.2.0
---

diff --git a/Lib/test/test_pyexpat.py b/Lib/test/test_pyexpat.py
index 8ef391791f71..79c4cff8079b 100644
--- a/Lib/test/test_pyexpat.py
+++ b/Lib/test/test_pyexpat.py
@@ -603,11 +603,9 @@ class MalformedInputTest(unittest.TestCase):
         # \xc2\x85 is UTF-8 encoded U+0085 (NEXT LINE)
         xml = b"<?xml version\xc2\x85='1.0'?>\r\n"
         parser = expat.ParserCreate()
-        try:
+        err_pattern = r'XML declaration not well-formed: line 1, column \d+'
+        with self.assertRaisesRegex(expat.ExpatError, err_pattern):
             parser.Parse(xml, True)
-            self.fail()
-        except expat.ExpatError as e:
-            self.assertEqual(str(e), 'XML declaration not well-formed: line 1, column 14')
 
 class ErrorMessageTest(unittest.TestCase):
     def test_codes(self):
diff --git a/Misc/NEWS b/Misc/NEWS
index 9daa23d9e8bf..707b4f2feed6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@ Library
 Tests
 -----
 
+- Issue #27369: In test_pyexpat, avoid testing an error message detail that
+  changed in Expat 2.2.0.
+
 - Issue #25940: Changed test_ssl and test_httplib to use
   self-signed.pythontest.net.  This avoids relying on svn.python.org, which
   recently changed root certificate.