SERVER-17932 Wrap passthrough tests in functions to take variables out of global scope

2 files changed, 54 insertions, 44 deletions

diff --git a/jstests/gle/0_gle_basics_passthrough.js b/jstests/gle/0_gle_basics_passthrough.js
index 40b69267b92..ceb9b467612 100644
--- a/jstests/gle/0_gle_basics_passthrough.js
+++ b/jstests/gle/0_gle_basics_passthrough.js
@@ -2,27 +2,31 @@
 // Tests the core GLE behavior
 //
 
-var conn = MongoRunner.runMongod({});
+(function() {
+     "use strict"
 
-// Remember the global 'db' var
-var lastDB = db;
+     var conn = MongoRunner.runMongod({});
 
-var coreTests = listFiles("jstests/gle/core");
+     // Remember the global 'db' var
+     var lastDB = db;
 
-coreTests.forEach( function(file) {
+     var coreTests = listFiles("jstests/gle/core");
 
-    // Reset global 'db' var
-    db = conn.getDB("testBasicGLE");
+     coreTests.forEach( function(file) {
 
-    print(" *******************************************");
-    print("         Test : " + file.name + " ...");
+                            // Reset global 'db' var
+                            db = conn.getDB("testBasicGLE");
 
-    var testTime = Date.timeFunc( function() { load(file.name); }, 1);
-    print("                " + testTime + "ms");
-});
+                            print(" *******************************************");
+                            print("         Test : " + file.name + " ...");
 
-print("Tests completed.");
+                            var testTime = Date.timeFunc( function() { load(file.name); }, 1);
+                            print("                " + testTime + "ms");
+                        });
 
-// Restore 'db' var
-db = lastDB;
-MongoRunner.stopMongod(conn);
\ No newline at end of file
+     print("Tests completed.");
+
+     // Restore 'db' var
+     db = lastDB;
+     MongoRunner.stopMongod(conn);
+ }());
\ No newline at end of file
diff --git a/jstests/gle/1_sharding_gle_basics_passthrough.js b/jstests/gle/1_sharding_gle_basics_passthrough.js
index 109fd3776c2..dad1f5ac5a2 100644
--- a/jstests/gle/1_sharding_gle_basics_passthrough.js
+++ b/jstests/gle/1_sharding_gle_basics_passthrough.js
@@ -2,42 +2,48 @@
 // Tests basic mongos GLE behavior
 //
 
-var passST = new ShardingTest({ name : "passST", shards : 2, mongos : 1 });
-var passMongos = passST.s0;
-assert.commandWorked(passMongos.getDB("admin").runCommand({ enableSharding : "testSharded" }));
+(function() {
+     "use strict"
 
-// Remember the global 'db' var
-var lastDB = db;
+     var passST = new ShardingTest({ name : "passST", shards : 2, mongos : 1 });
+     var passMongos = passST.s0;
+     assert.commandWorked(passMongos.getDB("admin").runCommand({ enableSharding : "testSharded" }));
 
-var coreTests = listFiles("jstests/gle/core");
+     // Remember the global 'db' var
+     var lastDB = db;
 
-var testsToSkip = new RegExp('[\\/\\\\](' +
-        'error1|' + // getPrevError not supported in sharding
-        'remove5|' +
-        'unique2|' +
-        'update4' +
-        ')\.js$');
+     var coreTests = listFiles("jstests/gle/core");
 
-coreTests.forEach( function(file) {
+     var testsToSkip = new RegExp('[\\/\\\\](' +
+                                  'error1|' + // getPrevError not supported in sharding
+                                  'remove5|' +
+                                  'unique2|' +
+                                  'update4' +
+                                  ')\.js$');
 
-    // Reset global 'db' var
-    db = passMongos.getDB("testBasicMongosGLE");
+     coreTests.forEach(
+         function(file) {
 
-    if (testsToSkip.test(file.name)) {
-        print(" !!!!!!!!!!!!!!! skipping test " + file.name);
-        return;
-    }
+             // Reset global 'db' var
+             db = passMongos.getDB("testBasicMongosGLE");
 
-    print(" *******************************************");
-    print("         Test : " + file.name + " ...");
+             if (testsToSkip.test(file.name)) {
+                 print(" !!!!!!!!!!!!!!! skipping test " + file.name);
+                 return;
+             }
 
+             print(" *******************************************");
+             print("         Test : " + file.name + " ...");
 
-    var testTime = Date.timeFunc( function() { load(file.name); }, 1);
-    print("                " + testTime + "ms");
-});
 
-print("Tests completed.");
+             var testTime = Date.timeFunc( function() { load(file.name); }, 1);
+             print("                " + testTime + "ms");
+         });
 
-// Restore 'db' var
-db = lastDB;
-passST.stop();
+     print("Tests completed.");
+
+     // Restore 'db' var
+     db = lastDB;
+     passST.stop();
+
+}());
\ No newline at end of file