Corrected some ordering issues with tests.

diff --git a/test/orm/expire.py b/test/orm/expire.py
index 3cb7101e5c9cc9199e1fc42d4c6170c38e7b6a4a..f49df84b6522ca50119cce31ad316248d507c6fc 100644 (file)
--- a/test/orm/expire.py
+++ b/test/orm/expire.py
@@ -645,16 +645,16 @@ class ExpireTest(_fixtures.FixtureTest):
         mapper(Address, addresses)
 
         sess = create_session()
-        userlist = sess.query(User).all()
+        userlist = sess.query(User).order_by(User.id).all()
         assert self.static.user_address_result == userlist
         assert len(list(sess)) == 9
         sess.expire_all()
         gc.collect()
         assert len(list(sess)) == 4 # since addresses were gc'ed
 
-        userlist = sess.query(User).all()
+        userlist = sess.query(User).order_by(User.id).all()
         u = userlist[1]
-        assert self.static.user_address_result == userlist
+        self.assertEquals(self.static.user_address_result, userlist)
         assert len(list(sess)) == 9
 
 class PolymorphicExpireTest(_base.MappedTest):

diff --git a/test/orm/inheritance/polymorph2.py b/test/orm/inheritance/polymorph2.py
index 2dec5a86bc6204e6feff813eed763808953e886b..faf8dc103b16d2a2e8fbe4b3fac7657326e68441 100644 (file)
--- a/test/orm/inheritance/polymorph2.py
+++ b/test/orm/inheritance/polymorph2.py
@@ -732,7 +732,7 @@ class GenerativeTest(TestBase, AssertsExecutionResults):
         
         r = session.query(Person).filter(Person.name.like('%2')).join('status').filter_by(name="active")
         assert str(list(r)) == "[Manager M2, category YYYYYYYYY, status Status active, Engineer E2, field X, status Status active]"
-        r = session.query(Engineer).join('status').filter(Person.name.in_(['E2', 'E3', 'E4', 'M4', 'M2', 'M1']) & (status.c.name=="active"))
+        r = session.query(Engineer).join('status').filter(Person.name.in_(['E2', 'E3', 'E4', 'M4', 'M2', 'M1']) & (status.c.name=="active")).order_by(Person.name)
         assert str(list(r)) == "[Engineer E2, field X, status Status active, Engineer E3, field X, status Status active]"
 
         r = session.query(Person).filter(exists([1], Car.owner==Person.person_id))

diff --git a/test/orm/query.py b/test/orm/query.py
index db709200b3426a3e6b3940eb6a0f7154b70c1932..407757c10a1b599ea8452ac7e26f12acf2a4fd29 100644 (file)
--- a/test/orm/query.py
+++ b/test/orm/query.py
@@ -1010,7 +1010,7 @@ class JoinTest(QueryTest):
         q = sess.query(User)
         AdAlias = aliased(Address)
         q = q.add_entity(AdAlias).select_from(outerjoin(User, AdAlias))
-        l = q.all()
+        l = q.order_by(User.id, Address.id).all()
         self.assertEquals(l, expected)
 
         sess.clear()
@@ -1291,7 +1291,7 @@ class InstancesTest(QueryTest, AssertsCompiledSQL):
         adalias = addresses.alias()
         q = sess.query(User).select_from(users.outerjoin(adalias)).options(contains_eager(User.addresses, alias=adalias))
         def go():
-            assert fixtures.user_address_result == q.all()
+            self.assertEquals(fixtures.user_address_result, q.order_by(User.id).all())
         self.assert_sql_count(testing.db, go, 1)
         sess.clear()
 
@@ -1687,7 +1687,7 @@ class MixedEntitiesTest(QueryTest):
         q = sess.query(User)
         adalias = addresses.alias('adalias')
         q = q.add_entity(Address, alias=adalias).select_from(users.outerjoin(adalias))
-        l = q.all()
+        l = q.order_by(User.id, Address.id).all()
         assert l == expected
 
         sess.clear()
@@ -2305,7 +2305,6 @@ class ExternalColumnsTest(QueryTest):
             Address(id=4, user=User(id=8, concat=16, count=3)),
             Address(id=5, user=User(id=9, concat=18, count=1))
         ]
-
         self.assertEquals(sess.query(Address).all(), address_result)
 
         # run the eager version twice to test caching of aliased clauses
@@ -2322,7 +2321,7 @@ class ExternalColumnsTest(QueryTest):
         )
 
         self.assertEquals(
-                sess.query(Address, ualias.count).join(('user', ualias)).join('user', aliased=True).all(),
+                sess.query(Address, ualias.count).join(('user', ualias)).join('user', aliased=True).order_by(Address.id).all(),
                 [
                     (Address(id=1), 1),
                     (Address(id=2), 3),
@@ -2332,7 +2331,7 @@ class ExternalColumnsTest(QueryTest):
                 ]
             )
 
-        self.assertEquals(sess.query(Address, ualias.concat, ualias.count).join(('user', ualias)).join('user', aliased=True).all(),
+        self.assertEquals(sess.query(Address, ualias.concat, ualias.count).join(('user', ualias)).join('user', aliased=True).order_by(Address.id).all(),
             [
                 (Address(id=1), 14, 1),
                 (Address(id=2), 16, 3),