diff options
| author | Tim Graham <timograham@gmail.com> | 2014-03-26 19:06:09 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-03-27 07:01:20 -0400 |
| commit | 0134d00be5446d9ae51a1a36e4e10289037f8782 (patch) | |
| tree | 11c3e3413562a0255f3fe8cc8aa1a3483dd0dd54 /tests | |
| parent | 3d74f1f64a78e5aeebb91c76e44d8e318a1c0023 (diff) | |
[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 7476d96f83a004d674244aeb7a66289035427396
Backport of c170c3761b from master
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/serializers_regress/tests.py | 5 |
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): |