From: Jim Phares <jim.phares@pcusa.org>
Date: Mon, 14 Mar 2011 15:51:38 +0000 (-0400)
Subject: Fixed order_by in test.orm.test_froms.MixedEntitiesTest.test_values.
X-Git-Tag: rel_0_7b3~33^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b327b981be9b55626bbce4091fc08b9588bd0d18;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Fixed order_by in test.orm.test_froms.MixedEntitiesTest.test_values.
---

diff --git a/test/orm/test_froms.py b/test/orm/test_froms.py
index 707f11426e..30579b93f2 100644
--- a/test/orm/test_froms.py
+++ b/test/orm/test_froms.py
@@ -697,10 +697,10 @@ class MixedEntitiesTest(QueryTest, AssertsCompiledSQL):
 
         adalias = aliased(Address)
         q2 = q.join(adalias, 'addresses').\
-                filter(User.name.like('%e%')).\
+                filter(User.name.like('%e%')).order_by(adalias.email_address).\
                 values(User.name, adalias.email_address)
-        eq_(list(q2), [(u'ed', u'ed@wood.com'), (u'ed', u'ed@bettyboop.com'), 
-                        (u'ed', u'ed@lala.com'), (u'fred', u'fred@fred.com')])
+        eq_(list(q2), [(u'ed', u'ed@bettyboop.com'), (u'ed', u'ed@lala.com'),
+                       (u'ed', u'ed@wood.com'), (u'fred', u'fred@fred.com')])
 
         q2 = q.values(func.count(User.name))
         assert q2.next() == (4,)