From 931655f41743a99521f60ebbd0b9199422099013 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 17 Jan 2014 18:52:14 -0500 Subject: cx_oracle is now "conditional" on py2k --- test/sql/test_types.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'test/sql') diff --git a/test/sql/test_types.py b/test/sql/test_types.py index 41095698c..3a263aab2 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_( -- cgit v1.2.1