[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 7476d96f83

Backport of c170c3761b from master
This commit is contained in:
Tim Graham 2014-03-26 19:06:09 -04:00
parent 3d74f1f64a
commit 0134d00be5
1 changed files with 2 additions and 3 deletions

View File

@ -10,7 +10,7 @@ from __future__ import unicode_literals
import datetime
import decimal
from unittest import expectedFailure, skipUnless
from unittest import skip, skipUnless
import warnings
try:
@ -482,8 +482,7 @@ def serializerTest(format, self):
self.assertEqual(count, klass.objects.count())
if connection.vendor == 'mysql' and six.PY3:
# Existing MySQL DB-API drivers fail on binary data.
serializerTest = expectedFailure(serializerTest)
serializerTest = skip("Existing MySQL DB-API drivers fail on binary data.")(serializerTest)
def naturalKeySerializerTest(format, self):