From 217f82d7139fd32f07adbfa92c5fb383d0ade577 Mon Sep 17 00:00:00 2001 From: aspalding Date: Tue, 16 Oct 2018 10:02:36 -0500 Subject: Refs #29838 -- Fixed make_hashable() for values that have lists or dicts nested in tuples. And for non-hashable values that are iterable, e.g. sets. --- tests/utils_tests/test_hashable.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/utils_tests/test_hashable.py b/tests/utils_tests/test_hashable.py index 2310c4c605..b4db3ef7d7 100644 --- a/tests/utils_tests/test_hashable.py +++ b/tests/utils_tests/test_hashable.py @@ -8,9 +8,11 @@ class TestHashable(SimpleTestCase): ([], ()), (['a', 1], ('a', 1)), ({}, ()), - ({'a'}, {'a'}), + ({'a'}, ('a',)), (frozenset({'a'}), {'a'}), ({'a': 1}, (('a', 1),)), + (('a', ['b', 1]), ('a', ('b', 1))), + (('a', {'b': 1}), ('a', (('b', 1),))), ) for value, expected in tests: with self.subTest(value=value): @@ -19,7 +21,15 @@ class TestHashable(SimpleTestCase): def test_count_equal(self): tests = ( ({'a': 1, 'b': ['a', 1]}, (('a', 1), ('b', ('a', 1)))), + ({'a': 1, 'b': ('a', [1, 2])}, (('a', 1), ('b', ('a', (1, 2))))), ) for value, expected in tests: with self.subTest(value=value): self.assertCountEqual(make_hashable(value), expected) + + def test_unhashable(self): + class Unhashable: + __hash__ = None + + with self.assertRaisesMessage(TypeError, "unhashable type: 'Unhashable'"): + make_hashable(Unhashable()) -- cgit v1.3