Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed a test that relied on the database to reject invalid data; MySQ…

…L doesn't. Refs #17055.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit b7f2aba56608fc65843abf50d1c1cc32af533a72 1 parent 8fb7a90
@aaugustin aaugustin authored
Showing with 6 additions and 0 deletions.
  1. +6 −0 tests/modeltests/fixtures/tests.py
View
6 tests/modeltests/fixtures/tests.py
@@ -4,6 +4,7 @@
from django.contrib.sites.models import Site
from django.core import management
+from django.db import connection
from django.test import TestCase, TransactionTestCase, skipUnlessDBFeature
from .models import Article, Book, Spy, Tag, Visa
@@ -260,6 +261,11 @@ def test_loaddata_error_message(self):
outputs an error message which contains the pk of the object
that triggered the error.
"""
+ # MySQL needs a little prodding to reject invalid data.
+ # This won't affect other tests because the database connection
+ # is closed at the end of each test.
+ if connection.vendor == 'mysql':
+ connection.cursor().execute("SET sql_mode = 'TRADITIONAL'")
new_io = StringIO.StringIO()
management.call_command('loaddata', 'invalid.json', verbosity=0, stderr=new_io, commit=False)
output = new_io.getvalue().strip().split('\n')

0 comments on commit b7f2aba

Please sign in to comment.
Something went wrong with that request. Please try again.