More test reliability...

Author: behackett

test/test_collection.py

@@ -1073,7 +1073,7 @@ def test_last_error_options(self):
  self.assertRaises(TimeoutError, self.db.test.update,
  {"x": 1}, {"y": 2}, w=2, wtimeout=1)
  self.assertRaises(TimeoutError, self.db.test.remove,
- {"x": 1}, {"y": 2}, w=2, wtimeout=1)
+ {"x": 1}, w=2, wtimeout=1)
 
  self.db.test.save({"x": 1}, w=1, wtimeout=1)
  self.db.test.insert({"x": 1}, w=1, wtimeout=1)
@@ -1846,16 +1846,18 @@ def change_subtype(collection, subtype):
 
  coll.uuid_subtype = UUID_SUBTYPE
  q = {"_id": uu}
- result = coll.inline_map_reduce(map, reduce, query=q)
- self.assertEqual([], result)
+ if version.at_least(self.db.connection, (1, 7, 4)):
+ result = coll.inline_map_reduce(map, reduce, query=q)
+ self.assertEqual([], result)
 
  result = coll.map_reduce(map, reduce, "results", query=q)
  self.assertEqual(0, db.results.count())
 
  coll.uuid_subtype = OLD_UUID_SUBTYPE
  q = {"_id": uu}
- result = coll.inline_map_reduce(map, reduce, query=q)
- self.assertEqual(2, len(result))
+ if version.at_least(self.db.connection, (1, 7, 4)):
+ result = coll.inline_map_reduce(map, reduce, query=q)
+ self.assertEqual(2, len(result))
 
  result = coll.map_reduce(map, reduce, "results", query=q)
  self.assertEqual(2, db.results.count())

test/test_pooling_base.py

@@ -804,7 +804,8 @@ def find_slow():
 
  # Javascript function that pauses N seconds per document
  fn = delay(10)
- if is_mongos(db.connection):
+ if (is_mongos(db.connection) or not
+ version.at_least(db.connection, (1, 7, 2))):
  # mongos doesn't support eval so we have to use $where
  # which is less reliable in this context.
  self.assertEqual(1, db.test.find({"$where": fn}).count())