summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Rassi <rassi@10gen.com>2015-11-23 19:07:14 -0500
committerJason Rassi <rassi@10gen.com>2015-11-24 14:29:09 -0500
commitcdd8c86aaae0da573bbea2e3c86267d42e8d6b56 (patch)
tree0fdf550803e030144a6a445b411494bb72f6a93f
parent60218f71fe95bdde1ea922783c4ab4c98ad6fa47 (diff)
downloadmongo-cdd8c86aaae0da573bbea2e3c86267d42e8d6b56.tar.gz
Revert "SERVER-21387 Temporarily disable bench_test_crud_commands.js"
This reverts commit e0d429dec55de8aaf0caf8f39321901cabafd9eb.
-rw-r--r--buildscripts/resmokeconfig/suites/core.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/core_ese.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/core_op_query.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/core_small_oplog.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/core_small_oplog_rs.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/dur_jscore_passthrough.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml2
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml2
8 files changed, 0 insertions, 15 deletions
diff --git a/buildscripts/resmokeconfig/suites/core.yml b/buildscripts/resmokeconfig/suites/core.yml
index ce97e8696fb..bc18986afe4 100644
--- a/buildscripts/resmokeconfig/suites/core.yml
+++ b/buildscripts/resmokeconfig/suites/core.yml
@@ -2,8 +2,6 @@ selector:
js_test:
roots:
- jstests/core/*.js
- exclude_files:
- - jstests/core/bench_test_crud_commands.js # Temporarily disabled; see SERVER-21387.
executor:
js_test:
diff --git a/buildscripts/resmokeconfig/suites/core_ese.yml b/buildscripts/resmokeconfig/suites/core_ese.yml
index 80c84cf2c5a..993b8dc6a86 100644
--- a/buildscripts/resmokeconfig/suites/core_ese.yml
+++ b/buildscripts/resmokeconfig/suites/core_ese.yml
@@ -6,8 +6,6 @@ selector:
js_test:
roots:
- jstests/core/*.js
- exclude_files:
- - jstests/core/bench_test_crud_commands.js # Temporarily disabled; see SERVER-21387.
executor:
js_test:
diff --git a/buildscripts/resmokeconfig/suites/core_op_query.yml b/buildscripts/resmokeconfig/suites/core_op_query.yml
index 3a9bd56df1b..9e803201f28 100644
--- a/buildscripts/resmokeconfig/suites/core_op_query.yml
+++ b/buildscripts/resmokeconfig/suites/core_op_query.yml
@@ -2,8 +2,6 @@ selector:
js_test:
roots:
- jstests/core/*.js
- exclude_files:
- - jstests/core/bench_test_crud_commands.js # Temporarily disabled; see SERVER-21387.
executor:
js_test:
diff --git a/buildscripts/resmokeconfig/suites/core_small_oplog.yml b/buildscripts/resmokeconfig/suites/core_small_oplog.yml
index de5f51f1f09..d3f52fa2158 100644
--- a/buildscripts/resmokeconfig/suites/core_small_oplog.yml
+++ b/buildscripts/resmokeconfig/suites/core_small_oplog.yml
@@ -3,8 +3,6 @@ selector:
roots:
- jstests/core/*.js
exclude_files:
- # bench_test_crud_commands.js is temporarily disabled; see SERVER-21387.
- - jstests/core/bench_test_crud_commands.js
# These tests are not expected to pass with master-slave:
- jstests/core/dbadmin.js
- jstests/core/opcounters_write_cmd.js
diff --git a/buildscripts/resmokeconfig/suites/core_small_oplog_rs.yml b/buildscripts/resmokeconfig/suites/core_small_oplog_rs.yml
index a745085d8ab..5ff41284a6a 100644
--- a/buildscripts/resmokeconfig/suites/core_small_oplog_rs.yml
+++ b/buildscripts/resmokeconfig/suites/core_small_oplog_rs.yml
@@ -3,8 +3,6 @@ selector:
roots:
- jstests/core/*.js
exclude_files:
- # bench_test_crud_commands.js is temporarily disabled; see SERVER-21387.
- - jstests/core/bench_test_crud_commands.js
# These tests are not expected to pass with replica-sets:
- jstests/core/dbadmin.js
- jstests/core/opcounters_write_cmd.js
diff --git a/buildscripts/resmokeconfig/suites/dur_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/dur_jscore_passthrough.yml
index dff45a21638..aff202f6a71 100644
--- a/buildscripts/resmokeconfig/suites/dur_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/dur_jscore_passthrough.yml
@@ -3,7 +3,6 @@ selector:
roots:
- jstests/core/*.js
exclude_files:
- - jstests/core/bench_test_crud_commands.js # Temporarily disabled; see SERVER-21387.
- jstests/core/repair*.js # Fails on recovery.
- jstests/core/shellkillop.js # Takes forever and doesn't test anything new.
diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
index 456fd210201..4a7368fe7c9 100644
--- a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
@@ -67,8 +67,6 @@ selector:
- jstests/core/eval0.js
- jstests/core/eval7.js
- jstests/core/eval9.js
- # bench_test_crud_commands.js is temporarily disabled; see SERVER-21387.
- - jstests/core/bench_test_crud_commands.js
executor:
js_test:
diff --git a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml
index a079b2f8868..c89eb0c9ef2 100644
--- a/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_jscore_passthrough.yml
@@ -40,8 +40,6 @@ selector:
# TODO: SERVER-18292 remove once OP_COMMAND is implemented in mongos.
- jstests/core/invalid_db_name.js
- jstests/core/validate_cmd_ns.js
- # bench_test_crud_commands.js is temporarily disabled; see SERVER-21387.
- - jstests/core/bench_test_crud_commands.js
executor:
js_test: