From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Tue, 5 Oct 2021 12:39:18 +0000 (-0700) Subject: bpo-45354: Skip obsolete device name tests on Windows 11 (GH-28712) X-Git-Tag: v3.9.8~103 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63c9a6cc8b48740c88199b5150c9948b1a61756b;p=thirdparty%2FPython%2Fcpython.git bpo-45354: Skip obsolete device name tests on Windows 11 (GH-28712) (cherry picked from commit de4052fe0633e3a053e66c8477f13677054d6ede) Co-authored-by: Jeremy Kloth --- diff --git a/Lib/test/test_winconsoleio.py b/Lib/test/test_winconsoleio.py index a44f7bbd27b7..7b2bfda339f9 100644 --- a/Lib/test/test_winconsoleio.py +++ b/Lib/test/test_winconsoleio.py @@ -92,9 +92,11 @@ class WindowsConsoleIOTests(unittest.TestCase): f.close() f.close() - f = open('C:/con', 'rb', buffering=0) - self.assertIsInstance(f, ConIO) - f.close() + # bpo-45354: Windows 11 changed MS-DOS device name handling + if sys.getwindowsversion()[:3] < (10, 0, 22000): + f = open('C:/con', 'rb', buffering=0) + self.assertIsInstance(f, ConIO) + f.close() @unittest.skipIf(sys.getwindowsversion()[:2] <= (6, 1), "test does not work on Windows 7 and earlier") @@ -114,7 +116,8 @@ class WindowsConsoleIOTests(unittest.TestCase): conout_path = os.path.join(temp_path, 'CONOUT$') with open(conout_path, 'wb', buffering=0) as f: - if sys.getwindowsversion()[:2] > (6, 1): + # bpo-45354: Windows 11 changed MS-DOS device name handling + if (6, 1) < sys.getwindowsversion()[:3] < (10, 0, 22000): self.assertIsInstance(f, ConIO) else: self.assertNotIsInstance(f, ConIO)