Skip to content

Commit b99a8dd

Browse files
committed
[GR-23318] Make test_ordered_dict pass.
PullRequest: graalpython/1698
2 parents bf16dc0 + 9d06e35 commit b99a8dd

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_ordered_dict.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
*graalpython.lib-python.3.test.test_ordered_dict.CPythonBuiltinDictTests.test_delitem_hash_collision
55
*graalpython.lib-python.3.test.test_ordered_dict.CPythonBuiltinDictTests.test_detect_deletion_during_iteration
66
*graalpython.lib-python.3.test.test_ordered_dict.CPythonBuiltinDictTests.test_highly_nested
7+
*graalpython.lib-python.3.test.test_ordered_dict.CPythonBuiltinDictTests.test_highly_nested_subclass
8+
*graalpython.lib-python.3.test.test_ordered_dict.CPythonBuiltinDictTests.test_init
79
*graalpython.lib-python.3.test.test_ordered_dict.CPythonBuiltinDictTests.test_override_update
810
*graalpython.lib-python.3.test.test_ordered_dict.CPythonBuiltinDictTests.test_popitem
911
*graalpython.lib-python.3.test.test_ordered_dict.CPythonBuiltinDictTests.test_setitem
@@ -37,8 +39,10 @@
3739
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_dict_setitem
3840
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_dict_update
3941
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_equality
42+
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_free_after_iterating
4043
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_fromkeys
4144
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_highly_nested
45+
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_highly_nested_subclass
4246
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_init
4347
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_init_calls
4448
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_issue24347
@@ -54,6 +58,7 @@
5458
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_popitem
5559
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_popitem_last
5660
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_reduce_not_too_fat
61+
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_reference_loop
5762
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_reinsert
5863
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_repr
5964
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictSubclassTests.test_repr_recursive
@@ -82,8 +87,10 @@
8287
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_dict_setitem
8388
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_dict_update
8489
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_equality
90+
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_free_after_iterating
8591
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_fromkeys
8692
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_highly_nested
93+
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_highly_nested_subclass
8794
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_init
8895
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_init_calls
8996
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_issue24347
@@ -99,6 +106,7 @@
99106
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_popitem
100107
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_popitem_last
101108
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_reduce_not_too_fat
109+
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_reference_loop
102110
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_reinsert
103111
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_repr
104112
*graalpython.lib-python.3.test.test_ordered_dict.CPythonOrderedDictTests.test_repr_recursive
@@ -155,8 +163,10 @@
155163
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_dict_setitem
156164
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_dict_update
157165
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_equality
166+
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_free_after_iterating
158167
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_fromkeys
159168
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_highly_nested
169+
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_highly_nested_subclass
160170
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_init
161171
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_init_calls
162172
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_issue24347
@@ -172,6 +182,7 @@
172182
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_popitem
173183
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_popitem_last
174184
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_reduce_not_too_fat
185+
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_reference_loop
175186
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_reinsert
176187
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_repr
177188
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictSubclassTests.test_repr_recursive
@@ -198,8 +209,10 @@
198209
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_dict_setitem
199210
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_dict_update
200211
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_equality
212+
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_free_after_iterating
201213
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_fromkeys
202214
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_highly_nested
215+
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_highly_nested_subclass
203216
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_init
204217
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_init_calls
205218
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_issue24347
@@ -215,6 +228,7 @@
215228
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_popitem
216229
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_popitem_last
217230
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_reduce_not_too_fat
231+
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_reference_loop
218232
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_reinsert
219233
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_repr
220234
*graalpython.lib-python.3.test.test_ordered_dict.PurePythonOrderedDictTests.test_repr_recursive

graalpython/lib-python/3/test/test_ordered_dict.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,7 @@ def test_highly_nested(self):
469469
del obj
470470
support.gc_collect()
471471

472+
@support.impl_detail("finalization", graalvm=False)
472473
def test_highly_nested_subclass(self):
473474
# Issues 25395 and 35983: test that the trashcan mechanism works
474475
# correctly for OrderedDict: deleting a highly nested OrderDict
@@ -637,6 +638,7 @@ def test_dict_update(self):
637638
dict.update(od, [('spam', 1)])
638639
self.assertNotIn('NULL', repr(od))
639640

641+
@support.impl_detail("finalization", graalvm=False)
640642
def test_reference_loop(self):
641643
# Issue 25935
642644
OrderedDict = self.OrderedDict
@@ -648,6 +650,7 @@ class A:
648650
gc.collect()
649651
self.assertIsNone(r())
650652

653+
@support.impl_detail("finalization", graalvm=False)
651654
def test_free_after_iterating(self):
652655
support.check_free_after_iterating(self, iter, self.OrderedDict)
653656
support.check_free_after_iterating(self, lambda d: iter(d.keys()), self.OrderedDict)

0 commit comments

Comments
 (0)