From 2adb640821123439c9b611375d01aba1d86b3b26 Mon Sep 17 00:00:00 2001 From: Erdenezul Batmunkh Date: Mon, 21 May 2018 09:19:03 +0800 Subject: [PATCH 1/6] modify bulk_insert test for pymongo3 --- tests/queryset/queryset.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py index 3fa86a58..50825e5c 100644 --- a/tests/queryset/queryset.py +++ b/tests/queryset/queryset.py @@ -846,10 +846,10 @@ class QuerySetTest(unittest.TestCase): Blog.objects.insert(blogs, load_bulk=False) if mongodb_version < (2, 6): - self.assertEqual(q, 1) + self.assertEqual(q, 99) else: # profiling logs each doc now in the bulk op - self.assertEqual(q, 99) + self.assertEqual(q, 1) Blog.drop_collection() Blog.ensure_indexes() @@ -859,7 +859,7 @@ class QuerySetTest(unittest.TestCase): Blog.objects.insert(blogs) if mongodb_version < (2, 6): - self.assertEqual(q, 2) # 1 for insert, and 1 for in bulk fetch + self.assertEqual(q, 101) # 100 for insert, and 1 for in bulk fetch else: # 99 for insert, and 1 for in bulk fetch self.assertEqual(q, 100) From e4451ccaf8616e27c3479e97bcb75daf76396488 Mon Sep 17 00:00:00 2001 From: Erdenezul Batmunkh Date: Mon, 21 May 2018 09:22:33 +0800 Subject: [PATCH 2/6] insert_many uses only one insert --- tests/queryset/queryset.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py index 50825e5c..8e91feae 100644 --- a/tests/queryset/queryset.py +++ b/tests/queryset/queryset.py @@ -845,11 +845,8 @@ class QuerySetTest(unittest.TestCase): blogs.append(Blog(title="post %s" % i, posts=[post1, post2])) Blog.objects.insert(blogs, load_bulk=False) - if mongodb_version < (2, 6): - self.assertEqual(q, 99) - else: - # profiling logs each doc now in the bulk op - self.assertEqual(q, 1) + # profiling logs each doc now in the bulk op + self.assertEqual(q, 99) Blog.drop_collection() Blog.ensure_indexes() @@ -861,8 +858,8 @@ class QuerySetTest(unittest.TestCase): if mongodb_version < (2, 6): self.assertEqual(q, 101) # 100 for insert, and 1 for in bulk fetch else: - # 99 for insert, and 1 for in bulk fetch - self.assertEqual(q, 100) + # 1 for insert, and 1 for in bulk fetch + self.assertEqual(q, 2) Blog.drop_collection() From f7a3acfaf45673ee379fc09de86f4fa484e907bc Mon Sep 17 00:00:00 2001 From: Erdenezul Batmunkh Date: Mon, 21 May 2018 09:34:44 +0800 Subject: [PATCH 3/6] query profiler test fix --- tests/queryset/queryset.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py index 8e91feae..9c7ac0e4 100644 --- a/tests/queryset/queryset.py +++ b/tests/queryset/queryset.py @@ -855,11 +855,7 @@ class QuerySetTest(unittest.TestCase): self.assertEqual(q, 0) Blog.objects.insert(blogs) - if mongodb_version < (2, 6): - self.assertEqual(q, 101) # 100 for insert, and 1 for in bulk fetch - else: - # 1 for insert, and 1 for in bulk fetch - self.assertEqual(q, 2) + self.assertEqual(q, 100) # 99 for insert 1 for fetch Blog.drop_collection() From 3f9ff7254f206e0926c6ab31cc3a1a1efe39ad2d Mon Sep 17 00:00:00 2001 From: Erdenezul Batmunkh Date: Mon, 21 May 2018 09:46:23 +0800 Subject: [PATCH 4/6] fix queryset tests --- tests/queryset/queryset.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py index 9c7ac0e4..dea5b110 100644 --- a/tests/queryset/queryset.py +++ b/tests/queryset/queryset.py @@ -970,7 +970,10 @@ class QuerySetTest(unittest.TestCase): org = Organization.objects.get(id=o1.id) with query_counter() as q: org.save(cascade=False) - self.assertEqual(q, 0) + if mongodb_version >= (3, 0): + self.assertEqual(q, 1) + else: + self.assertEqual(q, 0) # Saving a doc after you append a reference to it should result in # two db operations (a query for the reference and an update). From 6fb5c312c3a8d753c4a49a6e65bbc9db3d84f5bb Mon Sep 17 00:00:00 2001 From: Erdenezul Batmunkh Date: Mon, 21 May 2018 09:54:19 +0800 Subject: [PATCH 5/6] fix test error --- tests/queryset/queryset.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py index dea5b110..2b12d261 100644 --- a/tests/queryset/queryset.py +++ b/tests/queryset/queryset.py @@ -967,6 +967,11 @@ class QuerySetTest(unittest.TestCase): org.save() self.assertEqual(q, 0) + # get MongoDB version info + connection = get_connection() + info = connection.test.command('buildInfo') + mongodb_version = tuple([int(i) for i in info['version'].split('.')]) + org = Organization.objects.get(id=o1.id) with query_counter() as q: org.save(cascade=False) From 9bd328e147122133a64f00a71c5829c8803217ed Mon Sep 17 00:00:00 2001 From: Erdenezul Batmunkh Date: Mon, 21 May 2018 10:04:59 +0800 Subject: [PATCH 6/6] query_counter fix --- tests/queryset/queryset.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py index 2b12d261..9c7ac0e4 100644 --- a/tests/queryset/queryset.py +++ b/tests/queryset/queryset.py @@ -967,18 +967,10 @@ class QuerySetTest(unittest.TestCase): org.save() self.assertEqual(q, 0) - # get MongoDB version info - connection = get_connection() - info = connection.test.command('buildInfo') - mongodb_version = tuple([int(i) for i in info['version'].split('.')]) - org = Organization.objects.get(id=o1.id) with query_counter() as q: org.save(cascade=False) - if mongodb_version >= (3, 0): - self.assertEqual(q, 1) - else: - self.assertEqual(q, 0) + self.assertEqual(q, 0) # Saving a doc after you append a reference to it should result in # two db operations (a query for the reference and an update).