SERVER-30532 Remove IDL-generated parser for the findAndModify result

Instead only use a generator, but not parser. Also adds
lastErrorObject.upserted to the findAndModify retry result.

1 files changed, 1 insertions, 9 deletions

diff --git a/jstests/sharding/write_transactions_during_migration.js b/jstests/sharding/write_transactions_during_migration.js
index 7c52628e05e..c16ca9845f5 100644
--- a/jstests/sharding/write_transactions_during_migration.js
+++ b/jstests/sharding/write_transactions_during_migration.js
@@ -13,7 +13,6 @@ load('./jstests/libs/chunk_manipulation_util.js');
  * 4. Retry writes and confirm that writes are not duplicated.
  */
 (function() {
-
     "use strict";
 
     var staticMongod = MongoRunner.runMongod({});  // For startParallelOps.
@@ -67,14 +66,7 @@ load('./jstests/libs/chunk_manipulation_util.js');
 
     assert.eq(findAndModifyResult.ok, findAndModifyRetryResult.ok);
     assert.eq(findAndModifyResult.value, findAndModifyRetryResult.value);
-
-    // TODO: SERVER-30532: after adding upserted, just compare the entire lastErrorObject
-    var expectedLE = findAndModifyResult.lastErrorObject;
-    var toCheckLE = findAndModifyRetryResult.lastErrorObject;
-
-    assert.neq(null, toCheckLE);
-    assert.eq(findAndModifyResult.updatedExisting, findAndModifyRetryResult.updatedExisting);
-    assert.eq(findAndModifyResult.n, findAndModifyRetryResult.n);
+    assert.eq(findAndModifyResult.lastErrorObject, findAndModifyRetryResult.lastErrorObject);
 
     assert.eq(1, testDB.user.findOne({x: 30}).y);