Kaydet (Commit) 0134d00b authored tarafından Tim Graham's avatar Tim Graham

[1.7.x] Skipped a test that errors rather than marked it as an expectedFailure.

The test throws an error which Python 3.4 doesn't seem to catch as an
expectedFailure.

refs 7476d96f

Backport of c170c376 from master
üst 3d74f1f6
...@@ -10,7 +10,7 @@ from __future__ import unicode_literals ...@@ -10,7 +10,7 @@ from __future__ import unicode_literals
import datetime import datetime
import decimal import decimal
from unittest import expectedFailure, skipUnless from unittest import skip, skipUnless
import warnings import warnings
try: try:
...@@ -482,8 +482,7 @@ def serializerTest(format, self): ...@@ -482,8 +482,7 @@ def serializerTest(format, self):
self.assertEqual(count, klass.objects.count()) self.assertEqual(count, klass.objects.count())
if connection.vendor == 'mysql' and six.PY3: if connection.vendor == 'mysql' and six.PY3:
# Existing MySQL DB-API drivers fail on binary data. serializerTest = skip("Existing MySQL DB-API drivers fail on binary data.")(serializerTest)
serializerTest = expectedFailure(serializerTest)
def naturalKeySerializerTest(format, self): def naturalKeySerializerTest(format, self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment