From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 26 Nov 2022 15:14:02 +0000 (-0500)
Subject: sort for addresess relationship in new merge test
X-Git-Tag: rel_1_4_45~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4cf0f93f4bc1cbb5dc3ba2ed7a7f43a575e6d91;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

sort for addresess relationship in new merge test

saw a random failure under py2 on 1.4, will backport

Change-Id: I3e2b037bf4211be44e28f85f5e51ffdc218eeb5a
(cherry picked from commit 34e29f7b225cf1305e151af9d03ef95f42a9dbcc)
---

diff --git a/test/orm/test_merge.py b/test/orm/test_merge.py
index 8627755008..67307ed6cf 100644
--- a/test/orm/test_merge.py
+++ b/test/orm/test_merge.py
@@ -1430,6 +1430,7 @@ class MergeTest(_fixtures.FixtureTest):
                     viewonly=viewonly == "viewonly",
                     lazy=lazy,
                     back_populates="user",
+                    order_by=addresses.c.id,
                 )
             },
         )