SERVER-31243 Make no-op retry of findAndModify upsert of new document return null with new=false

Also unblacklists find_and_modify_server6582.js from the retryable writes passthrough suite

1 files changed, 7 insertions, 4 deletions

diff --git a/jstests/core/find_and_modify_server6226.js b/jstests/core/find_and_modify_server6226.js
index e847f6e5697..a4093142150 100644
--- a/jstests/core/find_and_modify_server6226.js
+++ b/jstests/core/find_and_modify_server6226.js
@@ -1,6 +1,9 @@
+(function() {
+    'use strict';
 
-t = db.find_and_modify_server6226;
-t.drop();
+    var t = db.find_and_modify_server6226;
+    t.drop();
 
-ret = t.findAndModify({query: {_id: 1}, update: {"$inc": {i: 1}}, upsert: true});
-assert.isnull(ret);
+    var ret = t.findAndModify({query: {_id: 1}, update: {"$inc": {i: 1}}, upsert: true});
+    assert.isnull(ret);
+})();