summaryrefslogtreecommitdiff
path: root/test/dialect/mysql
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2016-07-24 16:36:27 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2016-07-24 16:36:27 -0400
commit02190234a25bb5ed2b07d25e6adcece2f5bba763 (patch)
treeafdf90d7d9705e89792d0c4e549c640689e20488 /test/dialect/mysql
parent8952a30f0a27d6b57e7b054b8b464382b67e3828 (diff)
downloadsqlalchemy-02190234a25bb5ed2b07d25e6adcece2f5bba763.tar.gz
- a variety of test adjustments to accomodate for MySQL 5.7
Change-Id: Ied4245433d0d7b469dae6e7394c4931d8405f387
Diffstat (limited to 'test/dialect/mysql')
-rw-r--r--test/dialect/mysql/test_reflection.py1
-rw-r--r--test/dialect/mysql/test_types.py3
2 files changed, 2 insertions, 2 deletions
diff --git a/test/dialect/mysql/test_reflection.py b/test/dialect/mysql/test_reflection.py
index 44880c36b..ddf158167 100644
--- a/test/dialect/mysql/test_reflection.py
+++ b/test/dialect/mysql/test_reflection.py
@@ -98,7 +98,6 @@ class TypeReflectionTest(fixtures.TestBase):
def test_year_types(self):
specs = [
(mysql.YEAR(), mysql.YEAR(display_width=4)),
- (mysql.YEAR(display_width=2), mysql.YEAR(display_width=2)),
(mysql.YEAR(display_width=4), mysql.YEAR(display_width=4)),
]
diff --git a/test/dialect/mysql/test_types.py b/test/dialect/mysql/test_types.py
index 7b7cf3667..0cbb507c5 100644
--- a/test/dialect/mysql/test_types.py
+++ b/test/dialect/mysql/test_types.py
@@ -485,6 +485,7 @@ class TypesTest(fixtures.TestBase, AssertsExecutionResults, AssertsCompiledSQL):
)
+ @testing.requires.mysql_zero_date
@testing.provide_metadata
def test_timestamp_nullable(self):
ts_table = Table(
@@ -779,7 +780,7 @@ class EnumSetTest(
exc.StatementError, set_table.insert().execute,
e1='c', e2='c', e3='c', e4='c')
- @testing.fails_on("+oursql", "oursql raises on the truncate warning")
+ @testing.requires.mysql_non_strict
@testing.provide_metadata
def test_empty_set_no_empty_string(self):
t = Table(