Commits

Mike Bayer committed d363a4b

- fix a bunch of test failures

  • Participants
  • Parent commits d47a376

Comments (0)

Files changed (4)

lib/sqlalchemy/orm/strategy_options.py

 
     def _coerce_strat(self, strategy):
         if strategy is not None:
-            strategy = tuple(strategy.items())
+            strategy = tuple(sorted(strategy.items()))
         return strategy
 
     @_generative

test/orm/test_deferred.py

     joinedload, defaultload
 from sqlalchemy.testing import eq_, AssertsCompiledSQL
 from test.orm import _fixtures
-
+from sqlalchemy.orm import strategies
 
 class DeferredTest(AssertsCompiledSQL, _fixtures.FixtureTest):
 
         addresses = self.tables.addresses
         orders = self.tables.orders
 
-        mapper(User, users, properties={
-                "addresses": relationship(Address, lazy="joined"),
-                "orders": relationship(Order, lazy="joined")
-            })
+        mapper(User, users, properties=util.OrderedDict([
+                ("addresses", relationship(Address, lazy="joined")),
+                ("orders", relationship(Order, lazy="joined"))
+            ]))
+
         mapper(Address, addresses)
         mapper(Order, orders)
 

test/orm/test_options.py

 
         l1 = Load(User)
         l2 = l1.defer("name")
-        l3 = l2.context.values()[0]
+        l3 = list(l2.context.values())[0]
         eq_(
             l1.context,
             {

test/profiles.txt

 
 # TEST: test.aaa_profiling.test_zoomark.ZooMarkTest.test_profile_7_multiview
 
-test.aaa_profiling.test_zoomark.ZooMarkTest.test_profile_7_multiview 2.7_postgresql_psycopg2_cextensions 2300
+test.aaa_profiling.test_zoomark.ZooMarkTest.test_profile_7_multiview 2.7_postgresql_psycopg2_cextensions 2424
 test.aaa_profiling.test_zoomark.ZooMarkTest.test_profile_7_multiview 2.7_postgresql_psycopg2_nocextensions 2559
 test.aaa_profiling.test_zoomark.ZooMarkTest.test_profile_7_multiview 3.2_postgresql_psycopg2_nocextensions 2483
 test.aaa_profiling.test_zoomark.ZooMarkTest.test_profile_7_multiview 3.3_postgresql_psycopg2_cextensions 2460