From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 18 Oct 2009 02:52:56 +0000 (+0000)
Subject: fix MySQL tests
X-Git-Tag: rel_0_6beta1~247
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1d304ce6f9f9d5c64cd35814f76de6e772bc046;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix MySQL tests
---

diff --git a/test/dialect/test_mysql.py b/test/dialect/test_mysql.py
index cb6e6fc91b..9fc71be781 100644
--- a/test/dialect/test_mysql.py
+++ b/test/dialect/test_mysql.py
@@ -16,6 +16,7 @@ class TypesTest(TestBase, AssertsExecutionResults):
 
     __only_on__ = 'mysql'
 
+    @testing.uses_deprecated('Manually quoting ENUM value literals')
     def test_basic(self):
         meta1 = MetaData(testing.db)
         table = Table(
@@ -531,6 +532,7 @@ class TypesTest(TestBase, AssertsExecutionResults):
         finally:
             meta.drop_all()
 
+    @testing.uses_deprecated('Manually quoting ENUM value literals')
     def test_enum(self):
         """Exercise the ENUM type."""
 
@@ -611,6 +613,7 @@ class TypesTest(TestBase, AssertsExecutionResults):
         enum_table.drop()
 
     @testing.exclude('mysql', '<', (4,), "3.23 can't handle an ENUM of ''")
+    @testing.uses_deprecated('Manually quoting ENUM value literals')
     def test_enum_parse(self):
         """More exercises for the ENUM type."""
 
@@ -713,6 +716,7 @@ class ReflectionTest(TestBase, AssertsExecutionResults):
 
     @testing.exclude('mysql', '<', (5, 0, 0), 'early types are squirrely')
     @testing.uses_deprecated('Using String type with no length')
+    @testing.uses_deprecated('Manually quoting ENUM value literals')
     def test_type_reflection(self):
         # (ask_for, roundtripped_as_if_different)
         specs = [( String(1), mysql.MSString(1), ),
diff --git a/test/orm/test_query.py b/test/orm/test_query.py
index b24dfa8f65..41a5972676 100644
--- a/test/orm/test_query.py
+++ b/test/orm/test_query.py
@@ -941,8 +941,8 @@ class SetOpsTest(QueryTest, AssertsCompiledSQL):
         q5 = s.query(User, literal("y"))
         q6 = q4.union(q5)
         
-        for q in (q3, q6):
-            eq_(q.order_by(User.id).all(),
+        for q in (q3.order_by(User.id, "anon_1_anon_2"), q6.order_by(User.id, "foo")):
+            eq_(q.all(),
                 [
                     (User(id=7, name=u'jack'), u'x'), 
                     (User(id=7, name=u'jack'), u'y'),