From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 24 Nov 2020 06:34:16 +0000 (-0800)
Subject: bpo-41100: in test_platform, ignore 10.16 (GH-23485) (GH-23486)
X-Git-Tag: v3.9.1rc1~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96d906b144e6e6aa96c5ffebecbcc5d38034bbda;p=thirdparty%2FPython%2Fcpython.git

bpo-41100: in test_platform, ignore 10.16 (GH-23485) (GH-23486)

(cherry picked from commit c0c23ea72b76b06b7db0d09415fa90bab8ded63a)

Co-authored-by: Ned Deily <nad@python.org>
---

diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
index bd953b5d677e..a3b06feb6552 100644
--- a/Lib/test/test_platform.py
+++ b/Lib/test/test_platform.py
@@ -237,7 +237,10 @@ class PlatformTest(unittest.TestCase):
             # On Snow Leopard, sw_vers reports 10.6.0 as 10.6
             if len_diff > 0:
                 expect_list.extend(['0'] * len_diff)
-            self.assertEqual(result_list, expect_list)
+            # For compatibility with older binaries, macOS 11.x may report
+            # itself as '10.16' rather than '11.x.y'.
+            if result_list != ['10', '16']:
+                self.assertEqual(result_list, expect_list)
 
             # res[1] claims to contain
             # (version, dev_stage, non_release_version)