SERVER-32371 features2.js should exclude clusterTime metadata

(cherry picked from commit 471254ed8302dfffc3f7fb9d00e2d492df41f542)

1 files changed, 19 insertions, 11 deletions

diff --git a/jstests/sharding/features2.js b/jstests/sharding/features2.js
index f5fac5e3bb0..601e22fe3ca 100644
--- a/jstests/sharding/features2.js
+++ b/jstests/sharding/features2.js
@@ -1,14 +1,16 @@
 (function() {
 
+    "use strict";
+
     var s = new ShardingTest({name: "features2", shards: 2, mongos: 1});
 
     s.adminCommand({enablesharding: "test"});
     s.ensurePrimaryShard('test', 'shard0001');
 
-    a = s._connections[0].getDB("test");
-    b = s._connections[1].getDB("test");
+    let a = s._connections[0].getDB("test");
+    let b = s._connections[1].getDB("test");
 
-    db = s.getDB("test");
+    let db = s.getDB("test");
 
     // ---- distinct ----
 
@@ -75,13 +77,13 @@
     db.mr.save({x: 4, tags: ["b", "c"]});
     db.mr.ensureIndex({x: 1});
 
-    m = function() {
+    let m = function() {
         this.tags.forEach(function(z) {
             emit(z, {count: 1});
         });
     };
 
-    r = function(key, values) {
+    let r = function(key, values) {
         var total = 0;
         for (var i = 0; i < values.length; i++) {
             total += values[i].count;
@@ -89,7 +91,7 @@
         return {count: total};
     };
 
-    doMR = function(n) {
+    let doMR = function(n) {
         print(n);
 
         // on-disk
@@ -144,10 +146,10 @@
 
     doMR("after extra split");
 
-    cmd = {mapreduce: "mr", map: "emit( ", reduce: "fooz + ", out: "broken1"};
+    let cmd = {mapreduce: "mr", map: "emit( ", reduce: "fooz + ", out: "broken1"};
 
-    x = db.runCommand(cmd);
-    y = s._connections[0].getDB("test").runCommand(cmd);
+    let x = db.runCommand(cmd);
+    let y = s._connections[0].getDB("test").runCommand(cmd);
 
     printjson(x);
     printjson(y);
@@ -181,17 +183,23 @@
     assert.eq(x.ok, y.ok, "assert format");
 
     // isMaster and query-wrapped-command
-    isMaster = db.runCommand({isMaster: 1});
+    let isMaster = db.runCommand({isMaster: 1});
     assert(isMaster.ismaster);
     assert.eq('isdbgrid', isMaster.msg);
     delete isMaster.localTime;
+    delete isMaster.$clusterTime;
+    delete isMaster.operationTime;
 
-    im2 = db.runCommand({query: {isMaster: 1}});
+    let im2 = db.runCommand({query: {isMaster: 1}});
     delete im2.localTime;
+    delete im2.$clusterTime;
+    delete im2.operationTime;
     assert.eq(isMaster, im2);
 
     im2 = db.runCommand({$query: {isMaster: 1}});
     delete im2.localTime;
+    delete im2.$clusterTime;
+    delete im2.operationTime;
     assert.eq(isMaster, im2);
 
     s.stop();