Revert "SERVER-26491 Increase wtimeouts in tags2.js and tags_with_reconfig.js tests"

This reverts commit 538144e23629810fa62ef2e36fc4956b5c3398f1.

1 files changed, 50 insertions, 55 deletions

diff --git a/jstests/replsets/tags_with_reconfig.js b/jstests/replsets/tags_with_reconfig.js
index 53a22ac0889..512a55fe771 100644
--- a/jstests/replsets/tags_with_reconfig.js
+++ b/jstests/replsets/tags_with_reconfig.js
@@ -3,72 +3,67 @@
 // time.  This would cause us to update stale items in the cache when secondaries
 // reported their progress to a primary.
 
-(function() {
-    "use strict";
+// Start a replica set with 3 nodes
+var host = getHostName();
+var replTest = new ReplSetTest({name: "tags_with_reconfig", nodes: 3});
+var nodes = replTest.startSet();
+var ports = replTest.ports;
 
-    // Start a replica set with 3 nodes
-    var host = getHostName();
-    var replTest = new ReplSetTest({nodes: 3});
-    var nodes = replTest.startSet();
-    var ports = replTest.ports;
-
-    // Set tags and getLastErrorModes
-    var conf = {
-        _id: "tags_with_reconfig",
-        version: 1,
-        members: [
-            {_id: 0, host: host + ":" + ports[0], tags: {"dc": "bbb"}},
-            {_id: 1, host: host + ":" + ports[1], tags: {"dc": "bbb"}},
-            {_id: 2, host: host + ":" + ports[2], tags: {"dc": "ccc"}}
-        ],
-        settings: {
-            getLastErrorModes: {
-                anydc: {dc: 1},
-                alldc: {dc: 2},
-            }
+// Set tags and getLastErrorModes
+var conf = {
+    _id: "tags_with_reconfig",
+    version: 1,
+    members: [
+        {_id: 0, host: host + ":" + ports[0], tags: {"dc": "bbb"}},
+        {_id: 1, host: host + ":" + ports[1], tags: {"dc": "bbb"}},
+        {_id: 2, host: host + ":" + ports[2], tags: {"dc": "ccc"}}
+    ],
+    settings: {
+        getLastErrorModes: {
+            anydc: {dc: 1},
+            alldc: {dc: 2},
         }
-    };
+    }
+};
 
-    replTest.initiate(conf);
-    replTest.awaitReplication();
+replTest.initiate(conf);
+replTest.awaitReplication();
 
-    var wtimeout = 60 * 1000 * 5;
-    var master = replTest.getPrimary();
-    var db = master.getDB("test");
+master = replTest.getPrimary();
+var db = master.getDB("test");
 
-    // Insert a document with write concern : anydc
-    assert.writeOK(db.foo.insert({x: 1}, {writeConcern: {w: 'anydc', wtimeout: wtimeout}}));
+// Insert a document with write concern : anydc
+assert.writeOK(db.foo.insert({x: 1}, {writeConcern: {w: 'anydc', wtimeout: 20000}}));
 
-    // Insert a document with write concern : alldc
-    assert.writeOK(db.foo.insert({x: 2}, {writeConcern: {w: 'alldc', wtimeout: wtimeout}}));
+// Insert a document with write concern : alldc
+assert.writeOK(db.foo.insert({x: 2}, {writeConcern: {w: 'alldc', wtimeout: 20000}}));
 
-    // Add a new tag to the replica set
-    var config = master.getDB("local").system.replset.findOne();
-    printjson(config);
-    var modes = config.settings.getLastErrorModes;
-    config.version++;
-    config.members[0].tags.newtag = "newtag";
+// Add a new tag to the replica set
+var config = master.getDB("local").system.replset.findOne();
+printjson(config);
+var modes = config.settings.getLastErrorModes;
+config.version++;
+config.members[0].tags.newtag = "newtag";
 
-    try {
-        master.getDB("admin").runCommand({replSetReconfig: config});
-    } catch (e) {
-        print(e);
-    }
+try {
+    master.getDB("admin").runCommand({replSetReconfig: config});
+} catch (e) {
+    print(e);
+}
 
-    replTest.awaitReplication();
+replTest.awaitReplication();
 
-    // Print the new config for replica set
-    var config = master.getDB("local").system.replset.findOne();
-    printjson(config);
+// Print the new config for replica set
+var config = master.getDB("local").system.replset.findOne();
+printjson(config);
 
-    master = replTest.getPrimary();
-    var db = master.getDB("test");
+master = replTest.getPrimary();
+var db = master.getDB("test");
 
-    // Insert a document with write concern : anydc
-    assert.writeOK(db.foo.insert({x: 3}, {writeConcern: {w: 'anydc', wtimeout: wtimeout}}));
+// Insert a document with write concern : anydc
+assert.writeOK(db.foo.insert({x: 3}, {writeConcern: {w: 'anydc', wtimeout: 20000}}));
 
-    // Insert a document with write concern : alldc
-    assert.writeOK(db.foo.insert({x: 4}, {writeConcern: {w: 'alldc', wtimeout: wtimeout}}));
+// Insert a document with write concern : alldc
+assert.writeOK(db.foo.insert({x: 4}, {writeConcern: {w: 'alldc', wtimeout: 20000}}));
 
-    replTest.stopSet();
-}());
\ No newline at end of file
+replTest.stopSet();