2 files changed, 1 insertions, 86 deletions
diff --git a/jstests/noPassthroughWithMongod/sync6_slow.js b/jstests/noPassthroughWithMongod/sync6_slow.js
deleted file mode 100644
index 98e52f468a0..00000000000
--- a/jstests/noPassthroughWithMongod/sync6_slow.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// More complete version of sharding/sync6.js
-// Test that distributed lock forcing does not result in inconsistencies, using a
-// fast timeout. See comments about _testDistLockWithSkew in distlock_test.cpp for
-// more details.
-
-// Note that this test will always have random factors, since we can't control the
-// thread scheduling.
-
-var bitbucket = _isWindows() ? "NUL" : "/dev/null";
-var test = new SyncCCTest("sync6", {logpath: bitbucket, logappend: ""});
-
-// Startup another process to handle our commands to the cluster, mostly so it's
-// easier to read.
-var commandConn = MongoRunner.runMongod({});
-
-// Up the log level for this test
-commandConn.getDB( "admin" ).runCommand( { setParameter : 1, logLevel : 0 } );
-
-// Have lots of threads, so use larger i
-// Can't test too many, we get socket exceptions... possibly due to the
-// javascript console.
-// TODO:  Figure out our max bounds here - use less threads now to avoid pinger starvation issues.
-for ( var t = 0; t < 4; t++ ) {
-for ( var i = 4; i < 5; i++ ) {
-
-    // Our force time is 6 seconds - slightly diff from sync6 to ensure exact time not important
-    var takeoverMS = 6000;
-
-    // Generate valid sleep and skew for this timeout
-    var threadSleepWithLock = takeoverMS / 2;
-    var configServerTimeSkew = [ 0, 0, 0 ];
-    for ( var h = 0; h < 3; h++ ) {
-        // Skew by 1/30th the takeover time either way, at max
-        configServerTimeSkew[h] = ( i + h ) % Math.floor( takeoverMS / 60 );
-        // Make skew pos or neg
-        configServerTimeSkew[h] *= ( ( i + h ) % 2 ) ? -1 : 1;
-    }
-
-    // Build command
-    var command = { _testDistLockWithSkew : 1 };
-
-    // Basic test parameters
-    command["lockName"] = "TimeSkewFailNewTest_lock_" + i;
-    command["host"] = test.url;
-    command["seed"] = i;
-    command["numThreads"] = ( i % 50 ) + 1;
-
-    // Critical values so we're sure of correct operation
-    command["takeoverMS"] = takeoverMS;
-    command["wait"] = 4 * takeoverMS; // so we must force the lock
-    command["skewHosts"] = configServerTimeSkew;
-    command["threadWait"] = threadSleepWithLock;
-
-    // Less critical test params
-
-    // 1/3 of threads will not release the lock
-    command["hangThreads"] = 3;
-    // Amount of time to wait before trying lock again
-    command["threadSleep"] = 1; // ( ( i + 1 ) * 100 ) % (takeoverMS / 4)
-    // Amount of total clock skew possible between locking threads (processes)
-    // This can be large now.
-    command["skewRange"] = ( command["takeoverMS"] * 3 ) * 60 * 1000;
-
-    // Double-check our sleep, host skew, and takeoverMS values again
-
-    // At maximum, our threads must sleep only half the lock timeout time.
-    assert( command["threadWait"] <= command["takeoverMS"] / 2 );
-    for ( var h = 0; h < command["skewHosts"].length; h++ ) {
-        // At maximum, our config server time skew needs to be less than 1/30th
-        // the total time skew (1/60th either way).
-        assert( Math.abs( command["skewHosts"][h] ) <= ( command["takeoverMS"] / 60 ) );
-    }
-
-    var result = commandConn.getDB( "admin" ).runCommand( command );
-    printjson( result );
-    printjson( command );
-    assert( result.ok, "Skewed threads did not increment correctly." );
-
-}
-}
-
-MongoRunner.stopMongod(commandConn);
-test.stop();
diff --git a/jstests/noPassthroughWithMongod/testing_only_commands.js b/jstests/noPassthroughWithMongod/testing_only_commands.js
index 987f3cfa55f..523b64cc6a3 100644
--- a/jstests/noPassthroughWithMongod/testing_only_commands.js
+++ b/jstests/noPassthroughWithMongod/testing_only_commands.js
@@ -3,9 +3,7 @@
  * via the --enableTestCommands flag fail when that flag isn't provided.
  */
 
-var testOnlyCommands = ['_testDistLockWithSkew',
-                        '_skewClockCommand',
-                        'configureFailPoint',
+var testOnlyCommands = ['configureFailPoint',
                         '_hashBSONElement',
                         'replSetTest',
                         'journalLatencyTest',