PYTHON-989 - Check for write concern errors when using the findAndModify command.

Author: Luke Lovett

pymongo/collection.py

@@ -1928,6 +1928,7 @@ def __find_and_modify(self, filter, projection, sort, upsert=None,
  out = self._command(sock_info, cmd,
  read_preference=ReadPreference.PRIMARY,
  allowable_errors=[_NO_OBJ_ERROR])
+ _check_write_command_response([(0, out)])
  return out.get("value")
 
  def find_one_and_delete(self, filter,
@@ -2300,6 +2301,7 @@ def find_and_modify(self, query={}, update=None,
  out = self._command(sock_info, cmd,
  read_preference=ReadPreference.PRIMARY,
  allowable_errors=[_NO_OBJ_ERROR])
+ _check_write_command_response([(0, out)])
 
  if not out['ok']:
  if out["errmsg"] == _NO_OBJ_ERROR:

test/test_collection.py

@@ -41,7 +41,8 @@
  InvalidDocument,
  InvalidName,
  InvalidOperation,
- OperationFailure)
+ OperationFailure,
+ WriteConcernError)
 from pymongo.message import _COMMAND_OVERHEAD
 from pymongo.operations import *
 from pymongo.read_preferences import ReadPreference
@@ -1980,6 +1981,28 @@ def test_find_one_and_write_concern(self):
  self.assertEqual(
  {'w': 0}, results['started'][0].command['writeConcern'])
  results.clear()
+
+ # Test write concern errors.
+ c_wc_error = db.get_collection(
+ 'test',
+ write_concern=WriteConcern(w=len(client_context.nodes) + 1))
+ self.assertRaises(
+ WriteConcernError,
+ c_wc_error.find_and_modify,
+ {'_id': 1}, {'$set': {'foo': 'bar'}})
+ self.assertRaises(
+ WriteConcernError,
+ c_wc_error.find_one_and_update,
+ {'_id': 1}, {'$set': {'foo': 'bar'}})
+ self.assertRaises(
+ WriteConcernError,
+ c_wc_error.find_one_and_replace,
+ {'w': 0}, results['started'][0].command['writeConcern'])
+ self.assertRaises(
+ WriteConcernError,
+ c_wc_error.find_one_and_delete,
+ {'w': 0}, results['started'][0].command['writeConcern'])
+ results.clear()
  else:
  c_w0.find_and_modify(
  {'_id': 1}, {'$set': {'foo': 'bar'}})