PYTHON-2773 Mockupdb test failures (#796)

Author: juliusgeo

test/mockupdb/operations.py

@@ -15,6 +15,7 @@
 from collections import namedtuple
 
 from mockupdb import *
+from mockupdb import OpMsgReply
 from pymongo import ReadPreference
 
 __all__ = ['operations', 'upgrades']
@@ -51,11 +52,11 @@
 sharded cluster (PYTHON-868).
 """
 
-not_master_reply_to_query = OpReply(
+not_master_reply_to_query = OpMsgReply(
     {'$err': 'not master'},
     flags=REPLY_FLAGS['QueryFailure'])
 
-not_master_reply_to_command = OpReply(ok=0, errmsg='not master')
+not_master_reply_to_command = OpMsgReply(ok=0, errmsg='not master')
 
 operations = [
     Operation(
@@ -76,20 +77,6 @@
         reply={'cursor': {'id': 0, 'firstBatch': []}},
         op_type='may-use-secondary',
         not_master=not_master_reply_to_command),
-    Operation(
-        'mapreduce',
-        lambda client: client.db.collection.map_reduce(
-            'function() {}', 'function() {}'),
-        reply={'result': {'db': 'db', 'collection': 'out_collection'}},
-        op_type='must-use-primary',
-        not_master=not_master_reply_to_command),
-    Operation(
-        'inline_mapreduce',
-        lambda client: client.db.collection.inline_map_reduce(
-            'function() {}', 'function() {}', {'out': {'inline': 1}}),
-        reply={'results': []},
-        op_type='may-use-secondary',
-        not_master=not_master_reply_to_command),
     Operation(
         'options',
         lambda client: client.db.collection.options(),
@@ -109,12 +96,6 @@
         reply={'ok': 1},
         op_type='always-use-secondary',
         not_master=OpReply(ok=0, errmsg='node is recovering')),
-    Operation(
-        'listCollections',
-        lambda client: client.db.collection_names(),
-        reply={'cursor': {'id': 0, 'firstBatch': []}},
-        op_type='must-use-primary',
-        not_master=not_master_reply_to_command),
     Operation(
         'listIndexes',
         lambda client: client.db.collection.index_information(),
@@ -130,19 +111,9 @@
                      ['name', 'function', 'old', 'new', 'wire_version'])
 
 upgrades = [
-    Upgrade('index_information',
-            lambda client: client.db.collection.index_information(),
-            old=OpQuery(namespace='db.system.indexes'),
-            new=Command('listIndexes', 'collection', namespace='db'),
-            wire_version=3),
-    Upgrade('collection_names',
-            lambda client: client.db.collection_names(),
-            old=Command('aggregate', 'system.namespaces', namespace='db'),
-            new=Command('listCollections', namespace='db'),
-            wire_version=3),
-    Upgrade('options',
-            lambda client: client.db.collection.options(),
-            old=Command('aggregate', 'system.namespaces', namespace='db'),
-            new=Command('listCollections', namespace='db'),
-            wire_version=3),
+    Upgrade('estimated_document_count',
+            lambda client: client.db.collection.estimated_document_count(),
+            old=OpMsg('count', 'collection', namespace='db'),
+            new=OpMsg('aggregate', 'collection', namespace='db'),
+            wire_version=12),
 ]

test/mockupdb/test_auth_recovering_member.py

@@ -44,7 +44,7 @@ def test_auth_recovering_member(self):
         # error. If it raises AutoReconnect we know it actually tried the
         # server, and that's wrong.
         with self.assertRaises(ServerSelectionTimeoutError):
-            client.db.authenticate('user', 'password')
+            client.db.command("ping")
 
 if __name__ == '__main__':
     unittest.main()

test/mockupdb/test_cluster_time.py

@@ -19,8 +19,7 @@
 from pymongo import (MongoClient,
                      InsertOne,
                      UpdateOne,
-                     DeleteMany,
-                     version_tuple)
+                     DeleteMany)
 
 import unittest
 
@@ -54,23 +53,6 @@ def cluster_time_conversation(self, callback, replies):
                 reply['$clusterTime'] = {'clusterTime': cluster_time}
                 request.reply(reply)
 
-        # Now test that no commands include $clusterTime with wire version 5,
-        # even though the isMaster reply still has $clusterTime.
-        server.cancel_responder(responder)
-        server.autoresponds('ismaster',
-                            {'minWireVersion': 0,
-                             'maxWireVersion': 5,
-                             '$clusterTime': {'clusterTime': cluster_time}})
-
-        client = MongoClient(server.uri)
-        self.addCleanup(client.close)
-
-        with going(callback, client):
-            for reply in replies:
-                request = server.receives()
-                self.assertNotIn('$clusterTime', request)
-                request.reply(reply)
-
     def test_command(self):
         def callback(client):
             client.db.command('ping')
@@ -158,27 +140,16 @@ def test_monitor(self):
         request.reply(error)
 
         # PyMongo 3.11+ closes the monitoring connection on command errors.
-        if version_tuple >= (3, 11, -1):
-            # Fourth exchange: the Monitor closes the connection and runs the
-            # handshake on a new connection.
-            request = server.receives('ismaster')
-            # No $clusterTime in first ismaster, only in subsequent ones
-            self.assertNotIn('$clusterTime', request)
-
-            # Reply without $clusterTime.
-            reply.pop('$clusterTime')
-            request.reply(reply)
-        else:
-            # Fourth exchange: the Monitor retry attempt uses the clusterTime
-            # from the previous isMaster error.
-            request = server.receives('ismaster')
-            self.assertEqual(request['$clusterTime']['clusterTime'],
-                             cluster_time)
-
-            cluster_time = Timestamp(cluster_time.time,
-                                     cluster_time.inc + 1)
-            error['$clusterTime'] = {'clusterTime': cluster_time}
-            request.reply(error)
+
+        # Fourth exchange: the Monitor closes the connection and runs the
+        # handshake on a new connection.
+        request = server.receives('ismaster')
+        # No $clusterTime in first ismaster, only in subsequent ones
+        self.assertNotIn('$clusterTime', request)
+
+        # Reply without $clusterTime.
+        reply.pop('$clusterTime')
+        request.reply(reply)
 
         # Fifth exchange: the Monitor attempt uses the clusterTime from
         # the previous isMaster error.

test/mockupdb/test_cursor_namespace.py

@@ -15,7 +15,7 @@
 """Test list_indexes with more than one batch."""
 
 from mockupdb import going, MockupDB
-from pymongo import MongoClient, version_tuple
+from pymongo import MongoClient
 
 import unittest
 
@@ -57,7 +57,6 @@ def op():
             return list(self.client.test.collection.aggregate([]))
         self._test_cursor_namespace(op, 'aggregate')
 
-    @unittest.skipUnless(version_tuple >= (3, 11, -1), 'Fixed in pymongo 3.11')
     def test_find_cursor(self):
         def op():
             return list(self.client.test.collection.find())
@@ -71,7 +70,6 @@ def op():
 
 class TestKillCursorsNamespace(unittest.TestCase):
     @classmethod
-    @unittest.skipUnless(version_tuple >= (3, 12, -1), 'Fixed in pymongo 3.12')
     def setUpClass(cls):
         cls.server = MockupDB(auto_ismaster={'maxWireVersion': 6})
         cls.server.run()

test/mockupdb/test_handshake.py

@@ -14,7 +14,7 @@
 
 
 from mockupdb import MockupDB, OpReply, OpMsg, absent, Command, go
-from pymongo import MongoClient, version as pymongo_version, version_tuple
+from pymongo import MongoClient, version as pymongo_version
 from pymongo.errors import OperationFailure
 
 import unittest
@@ -33,7 +33,6 @@ def _check_handshake_data(request):
 
 
 class TestHandshake(unittest.TestCase):
-    @unittest.skipUnless(version_tuple >= (3, 4), "requires PyMongo 3.4")
     def test_client_handshake_data(self):
         primary, secondary = MockupDB(), MockupDB()
         for server in primary, secondary:
@@ -72,20 +71,14 @@ def test_client_handshake_data(self):
         primary.receives('ismaster', 1, client=absent).ok(error_response)
         secondary.receives('ismaster', 1, client=absent).ok(error_response)
 
-        # PyMongo 3.11+ closes the monitoring connection on command errors.
-        if version_tuple >= (3, 11, -1):
-            # The heartbeat retry (on a new connection) does have client data.
-            heartbeat = primary.receives('ismaster')
-            _check_handshake_data(heartbeat)
-            heartbeat.ok(primary_response)
-
-            heartbeat = secondary.receives('ismaster')
-            _check_handshake_data(heartbeat)
-            heartbeat.ok(secondary_response)
-        else:
-            # The heartbeat retry has no client data after a command failure.
-            primary.receives('ismaster', 1, client=absent).ok(error_response)
-            secondary.receives('ismaster', 1, client=absent).ok(error_response)
+        # The heartbeat retry (on a new connection) does have client data.
+        heartbeat = primary.receives('ismaster')
+        _check_handshake_data(heartbeat)
+        heartbeat.ok(primary_response)
+
+        heartbeat = secondary.receives('ismaster')
+        _check_handshake_data(heartbeat)
+        heartbeat.ok(secondary_response)
 
         # Still no client data.
         primary.receives('ismaster', 1, client=absent).ok(primary_response)
@@ -113,15 +106,11 @@ def test_client_handshake_data(self):
                     request.ok(primary_response)
             else:
                 # Command succeeds.
-                if version_tuple >= (3, 7):
-                    request.assert_matches(OpMsg('whatever'))
-                else:
-                    request.assert_matches(Command('whatever'))
+                request.assert_matches(OpMsg('whatever'))
                 request.ok()
                 assert future()
                 return
 
-    @unittest.skipUnless(version_tuple >= (3, 11, -1), "requires PyMongo 3.11")
     def test_client_handshake_saslSupportedMechs(self):
         server = MockupDB()
         server.run()