Fix various tests for mongos and old mongo versions.

Author: behackett

test/test_collection.py

@@ -831,6 +831,9 @@ def test_insert_manipulate_false(self):
  # 1. The return value is None or [None] as appropriate.
  # 2. _id is not set on the passed-in document object.
  # 3. _id is not sent to server.
+ if not version.at_least(self.db.connection, (2, 0)):
+ raise SkipTest('Need at least MongoDB 2.0')
+
  collection_name = 'test_insert_manipulate_false'
  try:
  self.db.drop_collection(collection_name)
@@ -1922,11 +1925,14 @@ def test_find_and_modify(self):
  c.insert({'_id': 1, 'i': 1})
 
  # Test that we raise DuplicateKeyError when appropriate.
- c.ensure_index('i', unique=True)
- self.assertRaises(DuplicateKeyError,
- c.find_and_modify, query={'i': 1, 'j': 1},
- update={'$set': {'k': 1}}, upsert=True)
- c.drop_indexes()
+ # MongoDB doesn't have a code field for DuplicateKeyError
+ # from commands before 2.2.
+ if version.at_least(self.db.connection, (2, 2)):
+ c.ensure_index('i', unique=True)
+ self.assertRaises(DuplicateKeyError,
+ c.find_and_modify, query={'i': 1, 'j': 1},
+ update={'$set': {'k': 1}}, upsert=True)
+ c.drop_indexes()
 
  # Test correct findAndModify
  self.assertEqual({'_id': 1, 'i': 1},
@@ -1962,20 +1968,23 @@ def test_find_and_modify(self):
  c.find_and_modify({'_id': 1}, {'$inc': {'i': 1}},
  new=True, fields={'i': 1}))
 
- # Test with full_response=True (version > 2.4.2)
- result = c.find_and_modify({'_id': 1}, {'$inc': {'i': 1}},
- new=True, upsert=True, 
- full_response=True,
- fields={'i': 1})
- self.assertEqual({'_id': 1, 'i': 5}, result["value"])
- self.assertEqual(True, result["lastErrorObject"]["updatedExisting"])
- 
- result = c.find_and_modify({'_id': 2}, {'$inc': {'i': 1}},
- new=True, upsert=True, 
- full_response=True,
- fields={'i': 1})
- self.assertEqual({'_id': 2, 'i': 1}, result["value"])
- self.assertEqual(False, result["lastErrorObject"]["updatedExisting"])
+ # Test with full_response=True
+ # No lastErrorObject from mongos until 2.0
+ if (not is_mongos(self.db.connection) or
+ version.at_least(self.db.connection, (2, 0))):
+ result = c.find_and_modify({'_id': 1}, {'$inc': {'i': 1}},
+ new=True, upsert=True,
+ full_response=True,
+ fields={'i': 1})
+ self.assertEqual({'_id': 1, 'i': 5}, result["value"])
+ self.assertEqual(True, result["lastErrorObject"]["updatedExisting"])
+
+ result = c.find_and_modify({'_id': 2}, {'$inc': {'i': 1}},
+ new=True, upsert=True,
+ full_response=True,
+ fields={'i': 1})
+ self.assertEqual({'_id': 2, 'i': 1}, result["value"])
+ self.assertEqual(False, result["lastErrorObject"]["updatedExisting"])
 
  class ExtendedDict(dict):
  pass

test/test_cursor.py

@@ -32,6 +32,7 @@
  OperationFailure)
 from test import version
 from test.test_client import get_client
+from test.utils import is_mongos
 
 
 class TestCursor(unittest.TestCase):
@@ -602,16 +603,17 @@ def test_add_remove_option(self):
  cursor.remove_option(32)
  self.assertEqual(2, cursor._Cursor__query_options())
 
- # Exhaust
- cursor = self.db.test.find(exhaust=True)
- self.assertEqual(64, cursor._Cursor__query_options())
- cursor2 = self.db.test.find().add_option(64)
- self.assertEqual(cursor._Cursor__query_options(),
- cursor2._Cursor__query_options())
- self.assertTrue(cursor._Cursor__exhaust)
- cursor.remove_option(64)
- self.assertEqual(0, cursor._Cursor__query_options())
- self.assertFalse(cursor._Cursor__exhaust)
+ # Exhaust - which mongos doesn't support
+ if not is_mongos(self.db.connection):
+ cursor = self.db.test.find(exhaust=True)
+ self.assertEqual(64, cursor._Cursor__query_options())
+ cursor2 = self.db.test.find().add_option(64)
+ self.assertEqual(cursor._Cursor__query_options(),
+ cursor2._Cursor__query_options())
+ self.assertTrue(cursor._Cursor__exhaust)
+ cursor.remove_option(64)
+ self.assertEqual(0, cursor._Cursor__query_options())
+ self.assertFalse(cursor._Cursor__exhaust)
 
  # Partial
  cursor = self.db.test.find(partial=True)

test/test_database.py

@@ -293,7 +293,9 @@ def test_command_ignores_network_timeout(self):
  {'$where': 'sleep(100); return true'}, network_timeout=0.001)
 
  self.assertEqual(1, cursor.count())
- db.command('eval', 'sleep(100)', network_timeout=0.001)
+ # mongos doesn't support the eval command
+ if not is_mongos(self.client):
+ db.command('eval', 'sleep(100)', network_timeout=0.001)
 
  def test_last_status(self):
  db = self.client.pymongo_test