Fixed tests against MongoDB 3.6

twisted · Jul 5, 2018 · 7de99f0 · 7de99f0
1 parent af44a1b
commit 7de99f0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/tests/mongod.py b/tests/mongod.py
@@ -68,7 +68,6 @@ def start(self):
                 b"--noprealloc", b"--nojournal",
                 b"--smallfiles", b"--nssize", b"1",
                 b"--oplogSize", b"1",
-                b"--nohttpinterface",
         ]
         if self.auth: args.append(b"--auth")
         if self.replset: args.extend([b"--replSet", self.replset])

diff --git a/tests/test_filters.py b/tests/test_filters.py
@@ -80,6 +80,9 @@ def test_TextIndex(self):
     def __3_2_or_higher(self):
         return self.db.command("buildInfo").addCallback(lambda info: info["versionArray"] >= [3, 2])
 
+    def __3_6_or_higher(self):
+        return self.db.command("buildInfo").addCallback(lambda info: info["versionArray"] >= [3, 6])
+
     @defer.inlineCallbacks
     def __test_simple_filter(self, filter, optionname, optionvalue):
         # Checking that `optionname` appears in profiler log with specified value
@@ -88,7 +91,9 @@ def __test_simple_filter(self, filter, optionname, optionvalue):
         yield self.coll.find({}, filter=filter)
         yield self.db.command("profile", 0)
 
-        if (yield self.__3_2_or_higher()):
+        if (yield self.__3_6_or_higher()):
+            profile_filter = {"command." + optionname: optionvalue}
+        elif (yield self.__3_2_or_higher()):
             # query options format in system.profile have changed in MongoDB 3.2
             profile_filter = {"query." + optionname: optionvalue}
         else:
@@ -123,7 +128,9 @@ def test_FilterMerge(self):
         yield self.coll.find({}, filter=qf.sort(qf.ASCENDING('x')) + qf.comment(comment))
         yield self.db.command("profile", 0)
 
-        if (yield self.__3_2_or_higher()):
+        if (yield self.__3_6_or_higher()):
+            profile_filter = {"command.sort.x": 1, "command.comment": comment}
+        elif (yield self.__3_2_or_higher()):
             profile_filter = {"query.sort.x": 1, "query.comment": comment}
         else:
             profile_filter = {"query.$orderby.x": 1, "query.$comment": comment}

diff --git a/tests/test_queries.py b/tests/test_queries.py
@@ -415,7 +415,8 @@ def test_CheckResult(self):
             "delete", "mycol", check=True,
             allowable_errors=[
                 "missing deletes field",
-                "The deletes option is required to the delete command."
+                "The deletes option is required to the delete command.",
+                "BSON field 'delete.deletes' is missing but a required field"
             ]
         )
         self.assertFalse(result["ok"])