Update query and mongo counts

cms/djangoapps/contentstore/tests/test_orphan.py

@@ -101,7 +101,7 @@ class TestOrphan(TestOrphanBase):
 
     @ddt.data(
         (ModuleStoreEnum.Type.split, 9, 6),
-        (ModuleStoreEnum.Type.mongo, 30, 13),
+        (ModuleStoreEnum.Type.mongo, 34, 13),
     )
     @ddt.unpack
     def test_delete_orphans(self, default_store, max_mongo_calls, min_mongo_calls):

lms/djangoapps/courseware/tests/test_views.py

@@ -1340,7 +1340,7 @@ class ProgressPageTests(ModuleStoreTestCase):
         self.assertContains(resp, u"Download Your Certificate")
 
     @ddt.data(
-        *itertools.product(((55, 4, True), (55, 4, False)), (True, False))
+        *itertools.product(((46, 4, True), (46, 4, False)), (True, False))
     )
     @ddt.unpack
     def test_query_counts(self, (sql_calls, mongo_calls, self_paced), self_paced_enabled):

lms/djangoapps/django_comment_client/forum/tests.py

@@ -342,11 +342,11 @@ class SingleThreadQueryCountTestCase(ModuleStoreTestCase):
 
     @ddt.data(
         # old mongo with cache
-        (ModuleStoreEnum.Type.mongo, 1, 6, 4, 18, 10),
-        (ModuleStoreEnum.Type.mongo, 50, 6, 4, 18, 10),
+        (ModuleStoreEnum.Type.mongo, 1, 6, 4, 17, 8),
+        (ModuleStoreEnum.Type.mongo, 50, 6, 4, 17, 8),
         # split mongo: 3 queries, regardless of thread response size.
-        (ModuleStoreEnum.Type.split, 1, 3, 3, 18, 10),
-        (ModuleStoreEnum.Type.split, 50, 3, 3, 18, 10),
+        (ModuleStoreEnum.Type.split, 1, 3, 3, 17, 8),
+        (ModuleStoreEnum.Type.split, 50, 3, 3, 17, 8),
     )
     @ddt.unpack
     def test_number_of_mongo_queries(

lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py

@@ -392,6 +392,6 @@ class TestInstructorDashboardPerformance(ModuleStoreTestCase, LoginEnrollmentTes
 
         # check MongoDB calls count
         url = reverse('spoc_gradebook', kwargs={'course_id': self.course.id})
-        with check_mongo_calls(8):
+        with check_mongo_calls(7):
             response = self.client.get(url)
             self.assertEqual(response.status_code, 200)