From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 8 Mar 2009 02:35:46 +0000 (+0000)
Subject: some buildbot fixes
X-Git-Tag: rel_0_5_3~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3953fe0ad45327c2894b49002e67b926ff44b1e0;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

some buildbot fixes
---

diff --git a/test/ext/serializer.py b/test/ext/serializer.py
index dc0a029c1d..77fc4870ea 100644
--- a/test/ext/serializer.py
+++ b/test/ext/serializer.py
@@ -120,6 +120,7 @@ class SerializeTest(testing.ORMTest):
 
         ualias = aliased(User)
         q = Session.query(User, ualias).join((ualias, User.id < ualias.id)).filter(User.id<9).order_by(User.id, ualias.id)
+        eq_(list(q.all()), [(u7, u8), (u7, u9), (u7, u10), (u8, u9), (u8, u10)])
 
         q2 = serializer.loads(serializer.dumps(q), users.metadata, Session)
         
diff --git a/test/orm/eager_relations.py b/test/orm/eager_relations.py
index 9dff0ffd19..be1d0a955d 100644
--- a/test/orm/eager_relations.py
+++ b/test/orm/eager_relations.py
@@ -307,19 +307,19 @@ class EagerTest(_fixtures.FixtureTest):
         closed_mapper = mapper(Order, closedorders, non_primary=True)
         
         mapper(User, users, properties = dict(
-            addresses = relation(Address, lazy=False),
+            addresses = relation(Address, lazy=False, order_by=addresses.c.id),
             open_orders = relation(
                 open_mapper,
                 primaryjoin=sa.and_(openorders.c.isopen == 1,
                                  users.c.id==openorders.c.user_id),
-                lazy=False),
+                lazy=False, order_by=openorders.c.id),
             closed_orders = relation(
                 closed_mapper,
                 primaryjoin=sa.and_(closedorders.c.isopen == 0,
                                  users.c.id==closedorders.c.user_id),
-                lazy=False)))
+                lazy=False, order_by=closedorders.c.id)))
 
-        q = create_session().query(User)
+        q = create_session().query(User).order_by(User.id)
 
         def go():
             assert [
diff --git a/test/profiling/zoomark.py b/test/profiling/zoomark.py
index 3a6cc9795f..c9f3d9df80 100644
--- a/test/profiling/zoomark.py
+++ b/test/profiling/zoomark.py
@@ -332,7 +332,7 @@ class ZooMarkTest(TestBase):
     def test_profile_2_insert(self):
         self.test_baseline_2_insert()
 
-    @profiling.function_call_count(3618, {'2.4': 2347})
+    @profiling.function_call_count(3834, {'2.4': 2347})
     def test_profile_3_properties(self):
         self.test_baseline_3_properties()