From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 17 Jan 2014 23:52:14 +0000 (-0500)
Subject: cx_oracle is now "conditional" on py2k
X-Git-Tag: rel_0_9_2~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=931655f41743a99521f60ebbd0b9199422099013;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

cx_oracle is now "conditional" on py2k
---

diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index 41095698c5..3a263aab2e 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -853,8 +853,11 @@ class UnicodeTest(fixtures.TestBase):
                 testing.db.dialect.returns_unicode_strings,
                 True if util.py3k else False
             )
-
-
+        elif testing.against('oracle+cx_oracle'):
+            eq_(
+                testing.db.dialect.returns_unicode_strings,
+                True if util.py3k else "conditional"
+            )
         else:
             expected = (testing.db.name, testing.db.driver) in \
                 (
@@ -867,7 +870,6 @@ class UnicodeTest(fixtures.TestBase):
                     ('mysql', 'mysqlconnector'),
                     ('sqlite', 'pysqlite'),
                     ('oracle', 'zxjdbc'),
-                    ('oracle', 'cx_oracle'),
                 )
 
             eq_(