From 4e0fc0b75a15995d961e44a7fafd2fadab9ec335 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 8 Nov 2022 18:28:13 -0500 Subject: [PATCH] adjust update/delete test for non-ordering this test sometimes has different ordering when running under CI Change-Id: I6dc3e24c6e23dc00a0ee5ba53e489ad813f12c58 --- test/orm/dml/test_update_delete_where.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/orm/dml/test_update_delete_where.py b/test/orm/dml/test_update_delete_where.py index 9c8809eef9..0dd769be14 100644 --- a/test/orm/dml/test_update_delete_where.py +++ b/test/orm/dml/test_update_delete_where.py @@ -1230,10 +1230,10 @@ class UpdateDeleteTest(fixtures.MappedTest): .execution_options(synchronize_session="fetch") .returning(User, User.name) ) - expected = [ + expected = { (User(age=37), "jack"), (User(age=27), "jane"), - ] + } elif crud_type == "delete": stmt = ( delete(User) @@ -1241,16 +1241,18 @@ class UpdateDeleteTest(fixtures.MappedTest): .execution_options(synchronize_session="fetch") .returning(User, User.name) ) - expected = [ + expected = { (User(age=47), "jack"), (User(age=37), "jane"), - ] + } else: assert False result = sess.execute(stmt) - eq_(result.all(), expected) + # note that ComparableEntity sets up __hash__ for mapped objects + # to point to the class, so you can test eq with sets + eq_(set(result.all()), expected) @testing.combinations(True, False, argnames="implicit_returning") def test_delete_fetch_returning(self, implicit_returning): -- 2.47.2