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 8627755008355ecafce772be437b237b8b0dcb25..67307ed6cfd2299f84975cb0b2cdf13791e75213 100644 (file)
--- 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,
                 )
             },
         )