summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-03-26 19:06:09 -0400
committerTim Graham <timograham@gmail.com>2014-03-27 06:11:39 -0400
commitc170c3761bf230e5891940b0fd9b2a9af20a41ae (patch)
tree9f0ed260e439ea12d25a80471fb5c581611e4bf7
parentb077ba7ac1af3fb6557d9d32dc08cf6da07cc73d (diff)
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 7476d96f83a004d674244aeb7a66289035427396
-rw-r--r--tests/serializers_regress/tests.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/serializers_regress/tests.py b/tests/serializers_regress/tests.py
index 489e68ce77..a2c748e242 100644
--- a/tests/serializers_regress/tests.py
+++ b/tests/serializers_regress/tests.py
@@ -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):