[Python-checkins] Handle different string hash algorithms correctly (#28147)

[brandtbucher]

https://github.com/python/cpython/commit/3beef86e22ade0ec629fcc349885fcec5ab43402
commit: 3beef86e22ade0ec629fcc349885fcec5ab43402
branch: main
author: Brandt Bucher <brandt at python.org>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2021-09-04T07:14:27-07:00
summary:

Handle different string hash algorithms correctly (#28147)

files:
M Lib/test/test_marshal.py

diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py
index bdfe79fbbecb3..8d55382b195a1 100644
--- a/Lib/test/test_marshal.py
+++ b/Lib/test/test_marshal.py
@@ -352,17 +352,20 @@ def test_deterministic_sets(self):
             for elements in (
                 "float('nan'), b'a', b'b', b'c', 'x', 'y', 'z'",
                 # Also test for bad interactions with backreferencing:
-                "('string', 1), ('string', 2), ('string', 3)",
+                "('Spam', 0), ('Spam', 1), ('Spam', 2)",
             ):
                 s = f"{kind}([{elements}])"
                 with self.subTest(s):
                     # First, make sure that our test case still has different
                     # orders under hash seeds 0 and 1. If this check fails, we
-                    # need to update this test with different elements:
-                    args = ["-c", f"print({s})"]
-                    _, repr_0, _ = assert_python_ok(*args, PYTHONHASHSEED="0")
-                    _, repr_1, _ = assert_python_ok(*args, PYTHONHASHSEED="1")
-                    self.assertNotEqual(repr_0, repr_1)
+                    # need to update this test with different elements. Skip
+                    # this part if we are configured to use any other hash
+                    # algorithm (for example, using Py_HASH_EXTERNAL):
+                    if sys.hash_info.algorithm in {"fnv", "siphash24"}:
+                        args = ["-c", f"print({s})"]
+                        _, repr_0, _ = assert_python_ok(*args, PYTHONHASHSEED="0")
+                        _, repr_1, _ = assert_python_ok(*args, PYTHONHASHSEED="1")
+                        self.assertNotEqual(repr_0, repr_1)
                     # Then, perform the actual test:
                     args = ["-c", f"import marshal; print(marshal.dumps({s}))"]
                     _, dump_0, _ = assert_python_ok(*args, PYTHONHASHSEED="0")