review changes

Author: prashantmital

pymongo/helpers.py

@@ -116,7 +116,7 @@ def _check_command_response(response, max_wire_version,
 
     if parse_write_concern_error and 'writeConcernError' in response:
         _error = response["writeConcernError"]
-        _labels = response.get("errorLabels", [])
+        _labels = response.get("errorLabels")
         if _labels:
             _error.update({'errorLabels': _labels})
         _raise_write_concern_error(_error)
@@ -225,9 +225,9 @@ def _check_write_command_response(result):
     if write_errors:
         _raise_last_write_error(write_errors)
 
-    error = result.get("writeConcernError", {})
+    error = result.get("writeConcernError")
     if error:
-        error_labels = result.get("errorLabels", [])
+        error_labels = result.get("errorLabels")
         if error_labels:
             error.update({'errorLabels': error_labels})
         _raise_write_concern_error(error)

test/test_retryable_writes.py

@@ -471,17 +471,11 @@ def test_RetryableWriteError_error_label(self):
             'mode': {'times': 2},
             'data': {
                 'failCommands': ['insert'],
-                'closeConnection': False,
                 'writeConcernError': {
                     'code': 91,
                     'errmsg': 'Replication is being shut down'},
             }}
 
-        if client_context.version < Version(4, 2):
-            # SERVER-39292: specifying closeConnection on MongoDB 4.0+,<4.2
-            # causes the failPoint to fire twice so we remove it.
-            fail_insert['data'].pop('closeConnection')
-
         # Ensure collection exists.
         client.pymongo_test.testcoll.insert_one({})