SERVER-16321 Re-enable v28_bad_upgrade_order.js, 2_test_launching_cluster.js

3 files changed, 9 insertions, 4 deletions

diff --git a/jstests/multiVersion/2_test_launching_cluster.js b/jstests/multiVersion/2_test_launching_cluster.js
index a6d78802bec..5c3ecc487bb 100644
--- a/jstests/multiVersion/2_test_launching_cluster.js
+++ b/jstests/multiVersion/2_test_launching_cluster.js
@@ -142,5 +142,5 @@ assert.allBinVersions( versionsToCheck, versionsFound );
 jsTest.log("DONE!");
    
 st.stop();
-});  // TODO: SERVER-16321 ());
+})();
 
diff --git a/jstests/multiVersion/libs/verify_versions.js b/jstests/multiVersion/libs/verify_versions.js
index ae381f64508..6537c083485 100644
--- a/jstests/multiVersion/libs/verify_versions.js
+++ b/jstests/multiVersion/libs/verify_versions.js
@@ -29,6 +29,7 @@ assert.allBinVersions = function(versionsWanted, versionsFound) {
                                                   versionsFound[j]))
             {
                 found = true;
+                var version = versionsWanted[i];
                 break;
             }
         }
diff --git a/jstests/multiVersion/v28_bad_upgrade_order.js b/jstests/multiVersion/v28_bad_upgrade_order.js
index 53f55adbf29..7cac75b4723 100644
--- a/jstests/multiVersion/v28_bad_upgrade_order.js
+++ b/jstests/multiVersion/v28_bad_upgrade_order.js
@@ -8,6 +8,8 @@ load('./jstests/multiVersion/libs/multi_cluster.js');
 // Clearing the connection pool deterministically is awkward - the actual command may fail due to
 // using the conn pool in order to talk to the config servers
 function clearConnPool(mongos) {
+    "use strict";
+
     assert.soon(function() {
         try {
             return mongos.adminCommand({connPoolSync : true}).ok;
@@ -21,10 +23,13 @@ function clearConnPool(mongos) {
 // Errors are A) currently opaque, and B) wrapped in other error messages, making it awkward to
 // detect different codes
 function isProtocolError(ex) {
+    "use strict";
+
     return /15907/.test(ex.toString());
 }
 
 function testBadUpgrade(isRSCluster) {
+    "use strict";
 
     jsTest.log("Starting " + (isRSCluster ? "(replica set)" : "") + " cluster...");
 
@@ -85,6 +90,5 @@ function testBadUpgrade(isRSCluster) {
     st.stop();
 }
 
-// TODO: SERVER-16321
-//testBadUpgrade(false);
-//testBadUpgrade(true);
+testBadUpgrade(false);
+testBadUpgrade(true);