summaryrefslogtreecommitdiff
path: root/test/sql
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-01-17 18:52:14 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2014-01-17 18:52:14 -0500
commit931655f41743a99521f60ebbd0b9199422099013 (patch)
tree7ece2b61c6a301663a60fa87c226d6f4b06ed0d6 /test/sql
parent882f615c68cd2d244a8d2cf480f3532a84bdb6fa (diff)
downloadsqlalchemy-931655f41743a99521f60ebbd0b9199422099013.tar.gz
cx_oracle is now "conditional" on py2k
Diffstat (limited to 'test/sql')
-rw-r--r--test/sql/test_types.py8
1 files changed, 5 insertions, 3 deletions
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_(