From b03c2c51909e3b5b5966d86a2829b5ddf2d496aa Mon Sep 17 00:00:00 2001
From: Zackery Spytz <zspytz@gmail.com>
Date: Thu, 6 Sep 2018 12:43:30 -0600
Subject: [PATCH] closes bpo-34594: Don't hardcode errno values in the tests.
 (GH-9076)

---
 Lib/test/test_spwd.py                                         | 2 --
 Lib/test/test_tabnanny.py                                     | 4 +++-
 .../next/Tests/2018-09-05-23-50-21.bpo-34594.tqL-GS.rst       | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Tests/2018-09-05-23-50-21.bpo-34594.tqL-GS.rst

diff --git a/Lib/test/test_spwd.py b/Lib/test/test_spwd.py
index e893f3a847f..07793c84c8e 100644
--- a/Lib/test/test_spwd.py
+++ b/Lib/test/test_spwd.py
@@ -67,8 +67,6 @@ class TestSpwdNonRoot(unittest.TestCase):
                 spwd.getspnam(name)
         except KeyError as exc:
             self.skipTest("spwd entry %r doesn't exist: %s" % (name, exc))
-        else:
-            self.assertEqual(str(cm.exception), '[Errno 13] Permission denied')
 
 
 if __name__ == "__main__":
diff --git a/Lib/test/test_tabnanny.py b/Lib/test/test_tabnanny.py
index ec887361730..845096e63c2 100644
--- a/Lib/test/test_tabnanny.py
+++ b/Lib/test/test_tabnanny.py
@@ -5,6 +5,7 @@ Glossary:
 """
 from unittest import TestCase, mock
 from unittest import mock
+import errno
 import tabnanny
 import tokenize
 import tempfile
@@ -232,7 +233,8 @@ class TestCheck(TestCase):
     def test_when_no_file(self):
         """A python file which does not exist actually in system."""
         path = 'no_file.py'
-        err = f"{path!r}: I/O Error: [Errno 2] No such file or directory: {path!r}\n"
+        err = f"{path!r}: I/O Error: [Errno {errno.ENOENT}] " \
+              f"No such file or directory: {path!r}\n"
         self.verify_tabnanny_check(path, err=err)
 
     def test_errored_directory(self):
diff --git a/Misc/NEWS.d/next/Tests/2018-09-05-23-50-21.bpo-34594.tqL-GS.rst b/Misc/NEWS.d/next/Tests/2018-09-05-23-50-21.bpo-34594.tqL-GS.rst
new file mode 100644
index 00000000000..7a7b1f05556
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2018-09-05-23-50-21.bpo-34594.tqL-GS.rst
@@ -0,0 +1 @@
+Fix usage of hardcoded ``errno`` values in the tests.