summaryrefslogtreecommitdiff
path: root/tests/delete
diff options
context:
space:
mode:
authorHasan Ramezani <hasan.r67@gmail.com>2020-04-18 18:31:17 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-04-20 09:51:54 +0200
commit35a67b3731dab2b546b3ed4d7f2deff529465c34 (patch)
tree05b7e25ca327961d6791f4b64b2e3657c7b809bd /tests/delete
parentc86201b6ed4f8256b0a0520c08aa674f623d4127 (diff)
downloaddjango-35a67b3731dab2b546b3ed4d7f2deff529465c34.tar.gz
Fixed #31474 -- Made QuerySet.delete() not return the number of deleted objects if it's zero.
Diffstat (limited to 'tests/delete')
-rw-r--r--tests/delete/tests.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/delete/tests.py b/tests/delete/tests.py
index d8424670c9..c32ebba83f 100644
--- a/tests/delete/tests.py
+++ b/tests/delete/tests.py
@@ -522,11 +522,10 @@ class DeletionTests(TestCase):
existed_objs = {
R._meta.label: R.objects.count(),
HiddenUser._meta.label: HiddenUser.objects.count(),
- A._meta.label: A.objects.count(),
- MR._meta.label: MR.objects.count(),
HiddenUserProfile._meta.label: HiddenUserProfile.objects.count(),
}
deleted, deleted_objs = R.objects.all().delete()
+ self.assertCountEqual(deleted_objs.keys(), existed_objs.keys())
for k, v in existed_objs.items():
self.assertEqual(deleted_objs[k], v)
@@ -550,13 +549,13 @@ class DeletionTests(TestCase):
existed_objs = {
R._meta.label: R.objects.count(),
HiddenUser._meta.label: HiddenUser.objects.count(),
- A._meta.label: A.objects.count(),
MR._meta.label: MR.objects.count(),
HiddenUserProfile._meta.label: HiddenUserProfile.objects.count(),
M.m2m.through._meta.label: M.m2m.through.objects.count(),
}
deleted, deleted_objs = r.delete()
self.assertEqual(deleted, sum(existed_objs.values()))
+ self.assertCountEqual(deleted_objs.keys(), existed_objs.keys())
for k, v in existed_objs.items():
self.assertEqual(deleted_objs[k], v)
@@ -694,7 +693,7 @@ class FastDeleteTests(TestCase):
with self.assertNumQueries(1):
self.assertEqual(
User.objects.filter(avatar__desc='missing').delete(),
- (0, {'delete.User': 0})
+ (0, {}),
)
def test_fast_delete_combined_relationships(self):