summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@oscaro.com>2014-06-05 17:06:50 +0200
committerAymeric Augustin <aymeric.augustin@oscaro.com>2014-06-05 17:11:10 +0200
commit237c229b91ae852ac5f4f0a52b37de3e243ee61f (patch)
treef18593b830de14077cf5c578fee351080827f8a8
parentae3fe6ccbb925236aa3cfc9173d2d307634fded4 (diff)
Avoided using BinaryField unecessarily in tests.
Several database backends struggle with binary data. This change minimizes the risk of unrelated tests failures when binary fields trigger errors. Forward-port of 2e4bcb9b from stable/1.7.x.
-rw-r--r--tests/backends/models.py5
-rw-r--r--tests/backends/tests.py6
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/backends/models.py b/tests/backends/models.py
index 5768960949..2a94c249ca 100644
--- a/tests/backends/models.py
+++ b/tests/backends/models.py
@@ -64,7 +64,6 @@ class Post(models.Model):
class Reporter(models.Model):
first_name = models.CharField(max_length=30)
last_name = models.CharField(max_length=30)
- raw_data = models.BinaryField()
def __str__(self):
return "%s %s" % (self.first_name, self.last_name)
@@ -112,3 +111,7 @@ class ObjectReference(models.Model):
def __str__(self):
return str(self.obj_id)
+
+
+class RawData(models.Model):
+ raw_data = models.BinaryField()
diff --git a/tests/backends/tests.py b/tests/backends/tests.py
index 29edaced6f..85ca0bcf16 100644
--- a/tests/backends/tests.py
+++ b/tests/backends/tests.py
@@ -334,9 +334,9 @@ class LastExecutedQueryTest(TestCase):
"""
Test that last_executed_query() returns an Unicode string
"""
- persons = models.Reporter.objects.filter(raw_data=b'\x00\x46 \xFE').extra(select={'föö': 1})
- sql, params = persons.query.sql_with_params()
- cursor = persons.query.get_compiler('default').execute_sql(CURSOR)
+ data = models.RawData.objects.filter(raw_data=b'\x00\x46 \xFE').extra(select={'föö': 1})
+ sql, params = data.query.sql_with_params()
+ cursor = data.query.get_compiler('default').execute_sql(CURSOR)
last_sql = cursor.db.ops.last_executed_query(cursor, sql, params)
self.assertIsInstance(last_sql, six.text_type)