summaryrefslogtreecommitdiff
path: root/tests/basic
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-03-20 10:41:53 +0100
committerClaude Paroz <claude@2xlibre.net>2013-03-20 10:41:53 +0100
commit23490a2394bf03e119e4c9a7a09a9ba35edad430 (patch)
treec0f630706965ff28f7e2ab34a0f2945dbfe75cb8 /tests/basic
parentccb87f97ada8c846e7d0860d95b619a199af243a (diff)
Revert "Fixed 19895 -- Made second iteration over invalid queryset raise an exception too"
This reverts commit 2cd0edaa477b327024e4007c8eaf46646dcd0f21. This commit was the cause of a memory leak. See ticket for more details. Thanks Anssi Kääriäinen for identifying the source of the bug.
Diffstat (limited to 'tests/basic')
-rw-r--r--tests/basic/tests.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/basic/tests.py b/tests/basic/tests.py
index a8005baca7..ccbb9bd423 100644
--- a/tests/basic/tests.py
+++ b/tests/basic/tests.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals
from datetime import datetime
import threading
-from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned, FieldError
+from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
from django.db import connections, DEFAULT_DB_ALIAS
from django.db.models.fields import Field, FieldDoesNotExist
from django.db.models.query import QuerySet, EmptyQuerySet, ValuesListQuerySet
@@ -689,11 +689,6 @@ class ModelTest(TestCase):
with self.assertNumQueries(0):
self.assertEqual(len(Article.objects.none().distinct('headline', 'pub_date')), 0)
- def test_invalid_qs_list(self):
- qs = Article.objects.order_by('invalid_column')
- self.assertRaises(FieldError, list, qs)
- self.assertRaises(FieldError, list, qs)
-
class ConcurrentSaveTests(TransactionTestCase):
@skipUnlessDBFeature('test_db_allows_multiple_connections')
def test_concurrent_delete_with_save(self):