summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Stearn <mathias@10gen.com>2015-09-30 13:20:20 -0400
committerMathias Stearn <mathias@10gen.com>2015-09-30 13:54:00 -0400
commit760a7c4776b89e223bd0b7f2766463e943a51ff9 (patch)
tree49fb09c09c6284b507c2c283c0accd9859f02657
parent07ede612d9daafb94388ffac0109741d41e96ef9 (diff)
downloadmongo-760a7c4776b89e223bd0b7f2766463e943a51ff9.tar.gz
SERVER-18400 remove unused passthrough tests
They are no longer executed and are unmaintained.
-rw-r--r--buildscripts/resmokeconfig/suites/durability.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/gle_auth.yml3
-rw-r--r--buildscripts/resmokeconfig/suites/no_passthrough_with_mongod.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/slow2.yml1
-rw-r--r--jstests/dur/dur_jscore_passthrough.js61
-rw-r--r--jstests/gle/0_gle_basics_passthrough.js32
-rw-r--r--jstests/gle/1_sharding_gle_basics_passthrough.js49
-rw-r--r--jstests/noPassthroughWithMongod/fluent_gle_passthrough.js45
-rw-r--r--jstests/slow2/sharding_jscore_passthrough.js177
9 files changed, 0 insertions, 372 deletions
diff --git a/buildscripts/resmokeconfig/suites/durability.yml b/buildscripts/resmokeconfig/suites/durability.yml
index 9a6e6d5404a..0653ff7ce02 100644
--- a/buildscripts/resmokeconfig/suites/durability.yml
+++ b/buildscripts/resmokeconfig/suites/durability.yml
@@ -5,8 +5,6 @@ selector:
exclude_files:
# SERVER-19124 closeall.js causes the task to time out in Evergreen.
- jstests/dur/closeall.js
- # Skip the passthrough test because it is run separately.
- - jstests/dur/dur_jscore_passthrough.js
# Durability tests start their own mongod's.
executor:
diff --git a/buildscripts/resmokeconfig/suites/gle_auth.yml b/buildscripts/resmokeconfig/suites/gle_auth.yml
index 2f2ec4e97af..ad8bc84c190 100644
--- a/buildscripts/resmokeconfig/suites/gle_auth.yml
+++ b/buildscripts/resmokeconfig/suites/gle_auth.yml
@@ -10,9 +10,6 @@ selector:
exclude_files:
# Skip any tests that run with auth explicitly.
- jstests/gle/*[aA]uth*.js
- # Skip the passthrough tests because those are run separately.
- - jstests/gle/0_gle_basics_passthrough.js
- - jstests/gle/1_sharding_gle_basics_passthrough.js
executor:
js_test:
diff --git a/buildscripts/resmokeconfig/suites/no_passthrough_with_mongod.yml b/buildscripts/resmokeconfig/suites/no_passthrough_with_mongod.yml
index c6b6ebcfe84..e6f05cacd47 100644
--- a/buildscripts/resmokeconfig/suites/no_passthrough_with_mongod.yml
+++ b/buildscripts/resmokeconfig/suites/no_passthrough_with_mongod.yml
@@ -3,8 +3,6 @@ selector:
roots:
- jstests/noPassthroughWithMongod/*.js
exclude_files:
- # Skip the passthrough test because it is run separately.
- - jstests/noPassthroughWithMongod/fluent_gle_passthrough.js
# SERVER-19093
- jstests/noPassthroughWithMongod/httpinterface.js
# stale_clustered.js temporarily disabled due to intermittent failures that are currently
diff --git a/buildscripts/resmokeconfig/suites/slow2.yml b/buildscripts/resmokeconfig/suites/slow2.yml
index 771e9d9a7ae..10a1ac2de85 100644
--- a/buildscripts/resmokeconfig/suites/slow2.yml
+++ b/buildscripts/resmokeconfig/suites/slow2.yml
@@ -6,7 +6,6 @@ selector:
# Skip the passthrough tests because each passthrough
# is run as its own independent suite.
- jstests/slow2/readmajority_jscore_passthrough.js
- - jstests/slow2/sharding_jscore_passthrough.js
executor:
js_test:
diff --git a/jstests/dur/dur_jscore_passthrough.js b/jstests/dur/dur_jscore_passthrough.js
deleted file mode 100644
index 354cb76a132..00000000000
--- a/jstests/dur/dur_jscore_passthrough.js
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// simple runner to run toplevel tests in jstests
-//
-
-var conn = MongoRunner.runMongod({journal: "", nopreallocj: "", smallfiles: "", journalOptions: 8});
-db = conn.getDB("test");
-conn.forceWriteMode("commands");
-
-function doTest() {
- "use strict"
-
- // Some tests use "conn" and can override the "conn" defined above, so save a copy of it here
- // in local scope.
- var myConn = conn.port;
-
- var files = listFiles("jstests/core");
- files = files.sort(compareOn('name'));
-
- var runnerStart = new Date()
-
- files.forEach(
- function (x) {
-
- if (/[\/\\]_/.test(x.name) ||
- !/\.js$/.test(x.name) ||
- /repair/.test(x.name) || // fails on recovery
- /shellkillop/.test(x.name) || // takes forever and don't test anything new
- false // placeholder so all real tests end in ||
- )
- {
- print(" >>>>>>>>>>>>>>> skipping " + x.name);
- return;
- }
-
- print();
- print(" *******************************************");
- print(" Test : " + x.name + " ...");
- print(" " + Date.timeFunc(function () { load(x.name); }, 1) + "ms");
- gc(); // TODO SERVER-8683: remove gc() calls once resolved
- }
- );
-
- MongoRunner.stopMongod(myConn);
-
- var runnerEnd = new Date()
-
- print( "total runner time: " + ( ( runnerEnd.getTime() - runnerStart.getTime() ) / 1000 ) + "secs" )
-}
-
-if (db.serverBuildInfo().bits == 64 &&
- db.serverBuildInfo().debug == false &&
- db.hostInfo().os.type == "Linux")
-{
- doTest();
-}
-else {
- print("Skipping. Only run this test on non-debug, 64bit, Linux builds");
-}
-
-//TODO(mathias): test recovery here
-
diff --git a/jstests/gle/0_gle_basics_passthrough.js b/jstests/gle/0_gle_basics_passthrough.js
deleted file mode 100644
index ceb9b467612..00000000000
--- a/jstests/gle/0_gle_basics_passthrough.js
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Tests the core GLE behavior
-//
-
-(function() {
- "use strict"
-
- var conn = MongoRunner.runMongod({});
-
- // Remember the global 'db' var
- var lastDB = db;
-
- var coreTests = listFiles("jstests/gle/core");
-
- coreTests.forEach( function(file) {
-
- // Reset global 'db' var
- db = conn.getDB("testBasicGLE");
-
- print(" *******************************************");
- print(" Test : " + file.name + " ...");
-
- var testTime = Date.timeFunc( function() { load(file.name); }, 1);
- print(" " + testTime + "ms");
- });
-
- 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
deleted file mode 100644
index 6b9f51c59cc..00000000000
--- a/jstests/gle/1_sharding_gle_basics_passthrough.js
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// Tests basic mongos GLE behavior
-//
-
-(function() {
- "use strict"
-
- var passST = new ShardingTest({ name : "passST", shards : 2, mongos : 1 });
- var passMongos = passST.s0;
- assert.commandWorked(passMongos.getDB("admin").runCommand({ enableSharding : "testSharded" }));
- passST.ensurePrimaryShard('testSharded', 'shard0001');
- // Remember the global 'db' var
- var lastDB = db;
-
- var coreTests = listFiles("jstests/gle/core");
-
- var testsToSkip = new RegExp('[\\/\\\\](' +
- 'error1|' + // getPrevError not supported in sharding
- 'remove5|' +
- 'unique2|' +
- 'update4' +
- ')\.js$');
-
- coreTests.forEach(
- function(file) {
-
- // Reset global 'db' var
- db = passMongos.getDB("testBasicMongosGLE");
-
- 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.");
-
- // Restore 'db' var
- db = lastDB;
- passST.stop();
-
-}());
diff --git a/jstests/noPassthroughWithMongod/fluent_gle_passthrough.js b/jstests/noPassthroughWithMongod/fluent_gle_passthrough.js
deleted file mode 100644
index 7b1c8bbcfde..00000000000
--- a/jstests/noPassthroughWithMongod/fluent_gle_passthrough.js
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// Tests the behavior of the shell's fluent (bulk) API under legacy opcode writes
-//
-
-(function() {
- "use strict"
-
- var conn = MongoRunner.runMongod({});
-
- // Explicitly disable write commands over this connection
- conn.useWriteCommands = function() { return false; };
- // Remember the global 'db' var
- var lastDB = db;
-
- // The fluent API tests are a subset of the standard suite
- var coreTests = listFiles("jstests/core");
- var fluentTests = [];
-
- var isFluentAPITest = function(fileName) {
- return /(^fluent_)|(^bulk_)/.test(fileName) && /\.js$/.test(fileName);
- };
-
- coreTests.forEach( function(file) {
- if (isFluentAPITest(file.baseName))
- fluentTests.push(file);
- });
-
- fluentTests.forEach( function(file) {
-
- // Reset global 'db' var
- db = conn.getDB("testFluent");
-
- print(" *******************************************");
- print(" Test : " + file.name + " ...");
-
- var testTime = Date.timeFunc( function() { load(file.name); }, 1);
- print(" " + testTime + "ms");
- });
-
- print("Tests completed.");
-
- // Restore 'db' var
- db = lastDB;
- MongoRunner.stopMongod(conn);
-}()); \ No newline at end of file
diff --git a/jstests/slow2/sharding_jscore_passthrough.js b/jstests/slow2/sharding_jscore_passthrough.js
deleted file mode 100644
index 21d8323f200..00000000000
--- a/jstests/slow2/sharding_jscore_passthrough.js
+++ /dev/null
@@ -1,177 +0,0 @@
-var db;
-
-(function() {
- "use strict"
-
- var myShardingTest = new ShardingTest("sharding_passthrough", 1, 0, 1);
- myShardingTest.adminCommand({ enablesharding : "test" });
-
- db = myShardingTest.getDB("test");
- db.getMongo().forceWriteMode("commands");
- _useWriteCommandsDefault = function() { return true; }; // for tests launching parallel shells.
-
- var res = db.adminCommand({ setParameter: 1, useClusterWriteCommands: true });
- var files = listFiles("jstests/core");
-
- var runnerStart = new Date();
-
- files.forEach(
- function(x) {
- if (/[\/\\]_/.test(x.name) || ! /\.js$/.test(x.name)) {
- print(" >>>>>>>>>>>>>>> skipping " + x.name);
- return;
- }
-
- // Notes:
-
- // apply_ops*: mongos doesn't implement "applyOps" -- SERVER-1439.
-
- // copydb, copydb2: copyDatabase seems not to work at all in
- // the ShardingTest setup. SERVER-1440.
-
- // dbcase: Database names are case-insensitive under ShardingTest?
- // SERVER-1443.
-
- // These are all SERVER-1444
- // count5: limit() and maybe skip() may be unreliable.
- // geo3: limit() not working, I think.
- // or4: skip() not working?
-
- // shellkillop: dunno yet. SERVER-1445
-
- // update_setOnInsert: db.setPrifilingLevel is not working. SERVER-8653
-
- // These should simply not be run under sharding:
- // dbadmin: Uncertain Cut-n-pasting its contents into mongo worked.
- // error1: getpreverror not supported under sharding.
- // fsync, fsync2: isn't supported through mongos.
- // remove5: getpreverror, I think. don't run.
- // update4: getpreverror don't run.
-
- // Around July 20, command passthrough went away, and these
- // commands weren't implemented:
- // clean cloneCollectionAsCapped copydbgetnonce dataSize
- // datasize dbstats deleteIndexes dropIndexes forceerror
- // getnonce logout profile reIndex repairDatabase
- // reseterror splitVector validate top
-
- /* missing commands :
- * forceerror and switchtoclienterrors
- * cloneCollectionAsCapped
- * splitvector
- * profile (apitest_db, cursor6, evalb)
- * copydbgetnonce
- * dbhash
- * medianKey
- * logout and getnonce
- */
-
- var failsInShardingPattern = new RegExp('[\\/\\\\](' +
- 'error3|' +
- 'capped.*|' +
- 'apitest_db|' +
- 'cursor6|' +
- 'copydb-auth|' +
- 'profile\\d*|' +
- 'dbhash|' +
- 'dbhash2|' +
- 'explain_missing_database|' +
- 'median|' +
- 'evalb|' +
- 'evald|' +
- 'eval_nolock|' +
- 'auth1|' +
- 'auth2|' +
- 'dropdb_race|' +
- 'unix_socket\\d*|' +
- // TODO: SERVER-17284 remove once find cmd is
- // implemented in mongos
- 'find_getmore_bsonsize|' +
- 'find_getmore_cmd|' +
- 'read_after_optime' +
- ')\.js$');
-
- // These are bugs (some might be fixed now):
- var mightBeFixedPattern = new RegExp('[\\/\\\\](' +
- 'count5|' +
- 'or4|' +
- 'shellkillop|' +
- 'update4|' +
- 'update_setOnInsert|' +
- 'profile\\d*|' +
- 'max_time_ms|' + // Will be fixed when SERVER-2212 is resolved.
- 'fts_querylang|' + // Will be fixed when SERVER-9063 is resolved.
- 'fts_projection' +
- ')\.js$');
-
- // These aren't supposed to get run under sharding:
- var notForShardingPattern = new RegExp('[\\/\\\\](' +
- 'apply_ops.*|' + // mongos has no applyOps cmd
- 'dbadmin|' +
- 'error1|' +
- 'fsync|' +
- 'fsync2|' +
- 'geo.*|' +
- 'indexh|' +
- 'index_bigkeys_nofail|' +
- 'remove5|' +
- 'update4|' +
- 'loglong|' +
- 'logpath|' +
- 'notablescan|' +
- 'collection_truncate|' + // relies on emptycapped test command which isn't in mongos
- 'compact.*|' +
- 'check_shard_index|' +
- 'bench_test.*|' +
- 'mr_replaceIntoDB|' +
- 'mr_auth|' +
- 'queryoptimizera|' +
- 'storageDetailsCommand|' +
- 'reversecursor|' +
- 'stages.*|' +
- 'top|' +
- 'repair_cursor1|' +
- 'touch1|' +
- 'query_oplogreplay|' + // no local db on mongos
- 'dbcase|' + // undo after fixing SERVER-11735
- 'dbcase2|' + // undo after fixing SERVER-11735
- 'stats' + // tests db.stats().dataFileVersion, which doesn't appear in sharded db.stats()
- ')\.js$');
-
- if (failsInShardingPattern.test(x.name)) {
- print(" >>>>>>>>>>>>>>> skipping test that would correctly fail under sharding: " + x.name);
- return;
- }
-
- if (mightBeFixedPattern.test(x.name)) {
- print(" !!!!!!!!!!!!!!! skipping test that has failed under sharding: " +
- "but might not anymore " + x.name);
- return;
- }
-
- if (notForShardingPattern.test(x.name)) {
- print(" !!!!!!!!!!!!!!! skipping test that should not run under sharding: " + x.name);
- return;
- }
-
- print(" *******************************************");
- print(" Test : " + x.name + " ...");
- print(" " +
- Date.timeFunc(function() {
- load(x.name);
- }, 1) + "ms");
-
- gc(); // TODO SERVER-8683: remove gc() calls once resolved
-
- // Reset "db" variable, just in case someone broke the rules and used it themselves
- db = myShardingTest.getDB("test");
- });
-
-
- myShardingTest.stop();
-
- var runnerEnd = new Date();
-
- print("total runner time: " + ((runnerEnd.getTime() - runnerStart.getTime()) / 1000) + "secs");
-
-}());