summaryrefslogtreecommitdiff
path: root/jstests
diff options
context:
space:
mode:
authoralabid <alabidan@gmail.com>2014-12-29 00:01:02 -0500
committerBenety Goh <benety@mongodb.com>2014-12-31 10:11:12 -0500
commitc8c43855e1d3158385a68df12919d2ea97f45ecd (patch)
treef4850c832ee2f3e0fcb42f92bca1922aa09e48f5 /jstests
parent2c3dea56d483ed0dca1413a69ef429f1429a7cad (diff)
downloadmongo-c8c43855e1d3158385a68df12919d2ea97f45ecd.tar.gz
SERVER-16695 Move FSM tests into new test suites
Closes #893 Signed-off-by: Benety Goh <benety@mongodb.com>
Diffstat (limited to 'jstests')
-rw-r--r--jstests/concurrency/fsm_all.js (renamed from jstests/parallel/fsm_all.js)4
-rw-r--r--jstests/concurrency/fsm_all_composed.js (renamed from jstests/parallel/fsm_all_composed.js)4
-rw-r--r--jstests/concurrency/fsm_all_master_slave.js (renamed from jstests/parallel/fsm_all_master_slave.js)4
-rw-r--r--jstests/concurrency/fsm_all_replication.js (renamed from jstests/parallel/fsm_all_replication.js)4
-rw-r--r--jstests/concurrency/fsm_all_sharded.js (renamed from jstests/parallel/fsm_all_sharded.js)4
-rw-r--r--jstests/concurrency/fsm_all_sharded_replication.js (renamed from jstests/parallel/fsm_all_sharded_replication.js)4
-rw-r--r--jstests/concurrency/fsm_all_simultaneous.js (renamed from jstests/parallel/fsm_all_simultaneous.js)4
-rw-r--r--jstests/concurrency/fsm_example.js (renamed from jstests/parallel/fsm_example.js)0
-rw-r--r--jstests/concurrency/fsm_example_inheritance.js (renamed from jstests/parallel/fsm_example_inheritance.js)4
-rw-r--r--jstests/concurrency/fsm_libs/assert.js (renamed from jstests/parallel/fsm_libs/assert.js)0
-rw-r--r--jstests/concurrency/fsm_libs/composer.js (renamed from jstests/parallel/fsm_libs/composer.js)2
-rw-r--r--jstests/concurrency/fsm_libs/fsm.js (renamed from jstests/parallel/fsm_libs/fsm.js)0
-rw-r--r--jstests/concurrency/fsm_libs/runner.js (renamed from jstests/parallel/fsm_libs/runner.js)16
-rw-r--r--jstests/concurrency/fsm_libs/utils.js (renamed from jstests/parallel/fsm_libs/utils.js)0
-rw-r--r--jstests/concurrency/fsm_libs/worker_thread.js (renamed from jstests/parallel/fsm_libs/worker_thread.js)4
-rw-r--r--jstests/concurrency/fsm_selftests.js (renamed from jstests/parallel/fsm_selftests.js)2
-rw-r--r--jstests/concurrency/fsm_workload_helpers/indexed_noindex.js (renamed from jstests/parallel/fsm_workload_helpers/indexed_noindex.js)0
-rw-r--r--jstests/concurrency/fsm_workloads/findAndModify_inc.js (renamed from jstests/parallel/fsm_workloads/findAndModify_inc.js)0
-rw-r--r--jstests/concurrency/fsm_workloads/indexed_insert_1char.js (renamed from jstests/parallel/fsm_workloads/indexed_insert_1char.js)4
-rw-r--r--jstests/concurrency/fsm_workloads/indexed_insert_1char_noindex.js10
-rw-r--r--jstests/concurrency/fsm_workloads/indexed_insert_base.js (renamed from jstests/parallel/fsm_workloads/indexed_insert_base.js)0
-rw-r--r--jstests/concurrency/fsm_workloads/indexed_insert_base_noindex.js10
-rw-r--r--jstests/concurrency/fsm_workloads/indexed_insert_heterogeneous.js (renamed from jstests/parallel/fsm_workloads/indexed_insert_heterogeneous.js)4
-rw-r--r--jstests/concurrency/fsm_workloads/indexed_insert_heterogeneous_noindex.js10
-rw-r--r--jstests/concurrency/fsm_workloads/indexed_insert_large.js (renamed from jstests/parallel/fsm_workloads/indexed_insert_large.js)4
-rw-r--r--jstests/concurrency/fsm_workloads/indexed_insert_large_noindex.js10
-rw-r--r--jstests/concurrency/fsm_workloads/indexed_insert_long_fieldname.js (renamed from jstests/parallel/fsm_workloads/indexed_insert_long_fieldname.js)4
-rw-r--r--jstests/concurrency/fsm_workloads/indexed_insert_long_fieldname_noindex.js10
-rw-r--r--jstests/concurrency/fsm_workloads/indexed_insert_multikey.js (renamed from jstests/parallel/fsm_workloads/indexed_insert_multikey.js)4
-rw-r--r--jstests/concurrency/fsm_workloads/indexed_insert_multikey_noindex.js10
-rw-r--r--jstests/concurrency/fsm_workloads/indexed_insert_ordered_bulk.js (renamed from jstests/parallel/fsm_workloads/indexed_insert_ordered_bulk.js)4
-rw-r--r--jstests/concurrency/fsm_workloads/indexed_insert_unordered_bulk.js (renamed from jstests/parallel/fsm_workloads/indexed_insert_unordered_bulk.js)4
-rw-r--r--jstests/concurrency/fsm_workloads/update_inc.js (renamed from jstests/parallel/fsm_workloads/update_inc.js)0
-rw-r--r--jstests/concurrency/fsm_workloads/update_ordered_bulk_inc.js (renamed from jstests/parallel/fsm_workloads/update_ordered_bulk_inc.js)0
-rw-r--r--jstests/parallel/fsm_workloads/indexed_insert_1char_noindex.js10
-rw-r--r--jstests/parallel/fsm_workloads/indexed_insert_base_noindex.js10
-rw-r--r--jstests/parallel/fsm_workloads/indexed_insert_heterogeneous_noindex.js10
-rw-r--r--jstests/parallel/fsm_workloads/indexed_insert_large_noindex.js10
-rw-r--r--jstests/parallel/fsm_workloads/indexed_insert_long_fieldname_noindex.js10
-rw-r--r--jstests/parallel/fsm_workloads/indexed_insert_multikey_noindex.js10
40 files changed, 102 insertions, 102 deletions
diff --git a/jstests/parallel/fsm_all.js b/jstests/concurrency/fsm_all.js
index e180556e1fa..34b0d1f5af0 100644
--- a/jstests/parallel/fsm_all.js
+++ b/jstests/concurrency/fsm_all.js
@@ -1,6 +1,6 @@
-load('jstests/parallel/fsm_libs/runner.js');
+load('jstests/concurrency/fsm_libs/runner.js');
-var dir = 'jstests/parallel/fsm_workloads';
+var dir = 'jstests/concurrency/fsm_workloads';
var blacklist = [
'indexed_insert_multikey.js' // SERVER-16143
diff --git a/jstests/parallel/fsm_all_composed.js b/jstests/concurrency/fsm_all_composed.js
index 594ecdbac81..a9ae736c27e 100644
--- a/jstests/parallel/fsm_all_composed.js
+++ b/jstests/concurrency/fsm_all_composed.js
@@ -1,6 +1,6 @@
-load('jstests/parallel/fsm_libs/runner.js');
+load('jstests/concurrency/fsm_libs/runner.js');
-var dir = 'jstests/parallel/fsm_workloads';
+var dir = 'jstests/concurrency/fsm_workloads';
var blacklist = [
'indexed_insert_multikey.js', // SERVER-16143
diff --git a/jstests/parallel/fsm_all_master_slave.js b/jstests/concurrency/fsm_all_master_slave.js
index c2de2d3a13d..085c07db8dc 100644
--- a/jstests/parallel/fsm_all_master_slave.js
+++ b/jstests/concurrency/fsm_all_master_slave.js
@@ -1,6 +1,6 @@
-load('jstests/parallel/fsm_libs/runner.js');
+load('jstests/concurrency/fsm_libs/runner.js');
-var dir = 'jstests/parallel/fsm_workloads';
+var dir = 'jstests/concurrency/fsm_workloads';
var blacklist = [
'indexed_insert_multikey.js' // SERVER-16143
diff --git a/jstests/parallel/fsm_all_replication.js b/jstests/concurrency/fsm_all_replication.js
index f00d28589b9..27f9395f3ed 100644
--- a/jstests/parallel/fsm_all_replication.js
+++ b/jstests/concurrency/fsm_all_replication.js
@@ -1,6 +1,6 @@
-load('jstests/parallel/fsm_libs/runner.js');
+load('jstests/concurrency/fsm_libs/runner.js');
-var dir = 'jstests/parallel/fsm_workloads';
+var dir = 'jstests/concurrency/fsm_workloads';
var blacklist = [
'indexed_insert_multikey.js' // SERVER-16143
diff --git a/jstests/parallel/fsm_all_sharded.js b/jstests/concurrency/fsm_all_sharded.js
index 7cb1a47ddaf..0fe5a2a1189 100644
--- a/jstests/parallel/fsm_all_sharded.js
+++ b/jstests/concurrency/fsm_all_sharded.js
@@ -1,6 +1,6 @@
-load('jstests/parallel/fsm_libs/runner.js');
+load('jstests/concurrency/fsm_libs/runner.js');
-var dir = 'jstests/parallel/fsm_workloads';
+var dir = 'jstests/concurrency/fsm_workloads';
var blacklist = [
'indexed_insert_multikey.js' // SERVER-16143
diff --git a/jstests/parallel/fsm_all_sharded_replication.js b/jstests/concurrency/fsm_all_sharded_replication.js
index b482252310b..ab4868f1153 100644
--- a/jstests/parallel/fsm_all_sharded_replication.js
+++ b/jstests/concurrency/fsm_all_sharded_replication.js
@@ -1,6 +1,6 @@
-load('jstests/parallel/fsm_libs/runner.js');
+load('jstests/concurrency/fsm_libs/runner.js');
-var dir = 'jstests/parallel/fsm_workloads';
+var dir = 'jstests/concurrency/fsm_workloads';
var blacklist = [
'indexed_insert_multikey.js' // SERVER-16143
diff --git a/jstests/parallel/fsm_all_simultaneous.js b/jstests/concurrency/fsm_all_simultaneous.js
index 8cd32a0ef90..018b5239939 100644
--- a/jstests/parallel/fsm_all_simultaneous.js
+++ b/jstests/concurrency/fsm_all_simultaneous.js
@@ -1,6 +1,6 @@
-load('jstests/parallel/fsm_libs/runner.js');
+load('jstests/concurrency/fsm_libs/runner.js');
-var dir = 'jstests/parallel/fsm_workloads';
+var dir = 'jstests/concurrency/fsm_workloads';
var blacklist = [
'indexed_insert_multikey.js' // SERVER-16143
diff --git a/jstests/parallel/fsm_example.js b/jstests/concurrency/fsm_example.js
index 6bb549258c3..6bb549258c3 100644
--- a/jstests/parallel/fsm_example.js
+++ b/jstests/concurrency/fsm_example.js
diff --git a/jstests/parallel/fsm_example_inheritance.js b/jstests/concurrency/fsm_example_inheritance.js
index e8e5452da3a..511135e6ff6 100644
--- a/jstests/parallel/fsm_example_inheritance.js
+++ b/jstests/concurrency/fsm_example_inheritance.js
@@ -1,5 +1,5 @@
-load('jstests/parallel/fsm_libs/runner.js'); // for extendWorkload
-load('jstests/parallel/fsm_example.js'); // for $config
+load('jstests/concurrency/fsm_libs/runner.js'); // for extendWorkload
+load('jstests/concurrency/fsm_example.js'); // for $config
// extendWorkload takes a $config object and a callback, and returns an extended $config object.
var $config = extendWorkload($config, function($config, $super) {
diff --git a/jstests/parallel/fsm_libs/assert.js b/jstests/concurrency/fsm_libs/assert.js
index e0409c132b5..e0409c132b5 100644
--- a/jstests/parallel/fsm_libs/assert.js
+++ b/jstests/concurrency/fsm_libs/assert.js
diff --git a/jstests/parallel/fsm_libs/composer.js b/jstests/concurrency/fsm_libs/composer.js
index c7e2e226e73..bc74afdcd19 100644
--- a/jstests/parallel/fsm_libs/composer.js
+++ b/jstests/concurrency/fsm_libs/composer.js
@@ -1,4 +1,4 @@
-load('jstests/parallel/fsm_libs/fsm.js');
+load('jstests/concurrency/fsm_libs/fsm.js');
var composer = (function() {
diff --git a/jstests/parallel/fsm_libs/fsm.js b/jstests/concurrency/fsm_libs/fsm.js
index e8ce2e27317..e8ce2e27317 100644
--- a/jstests/parallel/fsm_libs/fsm.js
+++ b/jstests/concurrency/fsm_libs/fsm.js
diff --git a/jstests/parallel/fsm_libs/runner.js b/jstests/concurrency/fsm_libs/runner.js
index e847feef69a..f48a609bd66 100644
--- a/jstests/parallel/fsm_libs/runner.js
+++ b/jstests/concurrency/fsm_libs/runner.js
@@ -1,7 +1,7 @@
load('jstests/libs/parallelTester.js');
-load('jstests/parallel/fsm_libs/assert.js');
-load('jstests/parallel/fsm_libs/utils.js');
-load('jstests/parallel/fsm_libs/worker_thread.js');
+load('jstests/concurrency/fsm_libs/assert.js');
+load('jstests/concurrency/fsm_libs/utils.js');
+load('jstests/concurrency/fsm_libs/worker_thread.js');
/** extendWorkload usage:
@@ -290,7 +290,7 @@ function prepareCollections(workloads, context, cluster, clusterOptions) {
var dbName, collName, myDB;
var firstWorkload = true;
- // Clean up the state left behind by other tests in the parallel suite
+ // Clean up the state left behind by other tests in the concurrency suite
// to avoid having too many open files
db.dropDatabase();
@@ -565,8 +565,8 @@ function throwError(workerErrs) {
}
workerThread.fsm = function(workloads, args) {
- load('jstests/parallel/fsm_libs/worker_thread.js'); // for workerThread.main
- load('jstests/parallel/fsm_libs/fsm.js'); // for fsm.run
+ load('jstests/concurrency/fsm_libs/worker_thread.js'); // for workerThread.main
+ load('jstests/concurrency/fsm_libs/fsm.js'); // for fsm.run
return workerThread.main(workloads, args, function(configs) {
var workloads = Object.keys(configs);
@@ -576,8 +576,8 @@ workerThread.fsm = function(workloads, args) {
};
workerThread.composed = function(workloads, args) {
- load('jstests/parallel/fsm_libs/worker_thread.js'); // for workerThread.main
- load('jstests/parallel/fsm_libs/composer.js'); // for composer.run
+ load('jstests/concurrency/fsm_libs/worker_thread.js'); // for workerThread.main
+ load('jstests/concurrency/fsm_libs/composer.js'); // for composer.run
return workerThread.main(workloads, args, function(configs) {
// TODO: make mixing probability configurable
diff --git a/jstests/parallel/fsm_libs/utils.js b/jstests/concurrency/fsm_libs/utils.js
index a9fa8fe0603..a9fa8fe0603 100644
--- a/jstests/parallel/fsm_libs/utils.js
+++ b/jstests/concurrency/fsm_libs/utils.js
diff --git a/jstests/parallel/fsm_libs/worker_thread.js b/jstests/concurrency/fsm_libs/worker_thread.js
index 01dfc29f694..a9b1631db78 100644
--- a/jstests/parallel/fsm_libs/worker_thread.js
+++ b/jstests/concurrency/fsm_libs/worker_thread.js
@@ -14,7 +14,7 @@ var workerThread = (function() {
var configs = {};
try {
- load('jstests/parallel/fsm_libs/assert.js');
+ load('jstests/concurrency/fsm_libs/assert.js');
globalAssertLevel = args.globalAssertLevel;
if (args.clusterOptions.addr) {
@@ -28,7 +28,7 @@ var workerThread = (function() {
myDB = db.getSiblingDB(args.dbName);
}
- load('jstests/parallel/fsm_libs/runner.js'); // for parseConfig
+ load('jstests/concurrency/fsm_libs/runner.js'); // for parseConfig
workloads.forEach(function(workload) {
load(workload);
var config = parseConfig($config); // to normalize
diff --git a/jstests/parallel/fsm_selftests.js b/jstests/concurrency/fsm_selftests.js
index 910c4916be6..b270c5a9ef2 100644
--- a/jstests/parallel/fsm_selftests.js
+++ b/jstests/concurrency/fsm_selftests.js
@@ -2,7 +2,7 @@
* This file tests the FSM test framework.
*/
-load('jstests/parallel/fsm_libs/fsm.js');
+load('jstests/concurrency/fsm_libs/fsm.js');
(function() {
var getWeightedRandomChoice = fsm._getWeightedRandomChoice;
diff --git a/jstests/parallel/fsm_workload_helpers/indexed_noindex.js b/jstests/concurrency/fsm_workload_helpers/indexed_noindex.js
index 7986bfd79cd..7986bfd79cd 100644
--- a/jstests/parallel/fsm_workload_helpers/indexed_noindex.js
+++ b/jstests/concurrency/fsm_workload_helpers/indexed_noindex.js
diff --git a/jstests/parallel/fsm_workloads/findAndModify_inc.js b/jstests/concurrency/fsm_workloads/findAndModify_inc.js
index 125b7d4f474..125b7d4f474 100644
--- a/jstests/parallel/fsm_workloads/findAndModify_inc.js
+++ b/jstests/concurrency/fsm_workloads/findAndModify_inc.js
diff --git a/jstests/parallel/fsm_workloads/indexed_insert_1char.js b/jstests/concurrency/fsm_workloads/indexed_insert_1char.js
index 3e358bbfca3..59864c876f0 100644
--- a/jstests/parallel/fsm_workloads/indexed_insert_1char.js
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_1char.js
@@ -5,8 +5,8 @@
* documents appear in both a collection scan and an index scan. The indexed
* value is a 1-character string based on the thread's id.
*/
-load('jstests/parallel/fsm_libs/runner.js'); // for parseConfig
-load('jstests/parallel/fsm_workloads/indexed_insert_base.js'); // for $config
+load('jstests/concurrency/fsm_libs/runner.js'); // for parseConfig
+load('jstests/concurrency/fsm_workloads/indexed_insert_base.js'); // for $config
var $config = extendWorkload($config, function($config, $super) {
diff --git a/jstests/concurrency/fsm_workloads/indexed_insert_1char_noindex.js b/jstests/concurrency/fsm_workloads/indexed_insert_1char_noindex.js
new file mode 100644
index 00000000000..b584e379f61
--- /dev/null
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_1char_noindex.js
@@ -0,0 +1,10 @@
+/**
+ * indexed_insert_1char_noindex.js
+ *
+ * Executes the indexed_insert_1char.js workload after dropping its index.
+ */
+load('jstests/concurrency/fsm_libs/runner.js'); // for extendWorkload
+load('jstests/concurrency/fsm_workloads/indexed_insert_1char.js'); // for $config
+load('jstests/concurrency/fsm_workload_helpers/indexed_noindex.js'); // for indexedNoindex
+
+var $config = extendWorkload($config, indexedNoindex);
diff --git a/jstests/parallel/fsm_workloads/indexed_insert_base.js b/jstests/concurrency/fsm_workloads/indexed_insert_base.js
index 09566b8b04b..09566b8b04b 100644
--- a/jstests/parallel/fsm_workloads/indexed_insert_base.js
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_base.js
diff --git a/jstests/concurrency/fsm_workloads/indexed_insert_base_noindex.js b/jstests/concurrency/fsm_workloads/indexed_insert_base_noindex.js
new file mode 100644
index 00000000000..c4888d62471
--- /dev/null
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_base_noindex.js
@@ -0,0 +1,10 @@
+/**
+ * indexed_insert_base_noindex.js
+ *
+ * Executes the indexed_insert_base.js workload after dropping its index.
+ */
+load('jstests/concurrency/fsm_libs/runner.js'); // for extendWorkload
+load('jstests/concurrency/fsm_workloads/indexed_insert_base.js'); // for $config
+load('jstests/concurrency/fsm_workload_helpers/indexed_noindex.js'); // for indexedNoindex
+
+var $config = extendWorkload($config, indexedNoindex);
diff --git a/jstests/parallel/fsm_workloads/indexed_insert_heterogeneous.js b/jstests/concurrency/fsm_workloads/indexed_insert_heterogeneous.js
index ee9470d68d4..6000b42cf6d 100644
--- a/jstests/parallel/fsm_workloads/indexed_insert_heterogeneous.js
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_heterogeneous.js
@@ -5,8 +5,8 @@
* documents appear in both a collection scan and an index scan. The indexed
* value is a different BSON type, depending on the thread's id.
*/
-load('jstests/parallel/fsm_libs/runner.js'); // for extendWorkload
-load('jstests/parallel/fsm_workloads/indexed_insert_base.js'); // for $config
+load('jstests/concurrency/fsm_libs/runner.js'); // for extendWorkload
+load('jstests/concurrency/fsm_workloads/indexed_insert_base.js'); // for $config
var $config = extendWorkload($config, function($config, $super) {
diff --git a/jstests/concurrency/fsm_workloads/indexed_insert_heterogeneous_noindex.js b/jstests/concurrency/fsm_workloads/indexed_insert_heterogeneous_noindex.js
new file mode 100644
index 00000000000..dfd96827807
--- /dev/null
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_heterogeneous_noindex.js
@@ -0,0 +1,10 @@
+/**
+ * indexed_insert_heterogeneous_noindex.js
+ *
+ * Executes the indexed_insert_heterogeneous.js workload after dropping its index.
+ */
+load('jstests/concurrency/fsm_libs/runner.js'); // for extendWorkload
+load('jstests/concurrency/fsm_workloads/indexed_insert_heterogeneous.js'); // for $config
+load('jstests/concurrency/fsm_workload_helpers/indexed_noindex.js'); // for indexedNoindex
+
+var $config = extendWorkload($config, indexedNoindex);
diff --git a/jstests/parallel/fsm_workloads/indexed_insert_large.js b/jstests/concurrency/fsm_workloads/indexed_insert_large.js
index fb4f34d2e0a..7dbd48a5ff4 100644
--- a/jstests/parallel/fsm_workloads/indexed_insert_large.js
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_large.js
@@ -6,8 +6,8 @@
* value is a string large enough to make the whole index key be 1K, which is
* the maximum.
*/
-load('jstests/parallel/fsm_libs/runner.js'); // for parseConfig
-load('jstests/parallel/fsm_workloads/indexed_insert_base.js'); // for $config
+load('jstests/concurrency/fsm_libs/runner.js'); // for parseConfig
+load('jstests/concurrency/fsm_workloads/indexed_insert_base.js'); // for $config
var $config = extendWorkload($config, function($config, $super) {
diff --git a/jstests/concurrency/fsm_workloads/indexed_insert_large_noindex.js b/jstests/concurrency/fsm_workloads/indexed_insert_large_noindex.js
new file mode 100644
index 00000000000..5797a24f187
--- /dev/null
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_large_noindex.js
@@ -0,0 +1,10 @@
+/**
+ * indexed_insert_large_noindex.js
+ *
+ * Executes the indexed_insert_large.js workload after dropping its index.
+ */
+load('jstests/concurrency/fsm_libs/runner.js'); // for extendWorkload
+load('jstests/concurrency/fsm_workloads/indexed_insert_large.js'); // for $config
+load('jstests/concurrency/fsm_workload_helpers/indexed_noindex.js'); // for indexedNoindex
+
+var $config = extendWorkload($config, indexedNoindex);
diff --git a/jstests/parallel/fsm_workloads/indexed_insert_long_fieldname.js b/jstests/concurrency/fsm_workloads/indexed_insert_long_fieldname.js
index 55fbdb5b42a..12910ea20d4 100644
--- a/jstests/parallel/fsm_workloads/indexed_insert_long_fieldname.js
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_long_fieldname.js
@@ -5,8 +5,8 @@
* documents appear in both a collection scan and an index scan. The indexed
* field name is a long string.
*/
-load('jstests/parallel/fsm_libs/runner.js'); // for extendWorkload
-load('jstests/parallel/fsm_workloads/indexed_insert_base.js'); // for $config
+load('jstests/concurrency/fsm_libs/runner.js'); // for extendWorkload
+load('jstests/concurrency/fsm_workloads/indexed_insert_base.js'); // for $config
var $config = extendWorkload($config, function($config, $super) {
diff --git a/jstests/concurrency/fsm_workloads/indexed_insert_long_fieldname_noindex.js b/jstests/concurrency/fsm_workloads/indexed_insert_long_fieldname_noindex.js
new file mode 100644
index 00000000000..5676fc01ccc
--- /dev/null
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_long_fieldname_noindex.js
@@ -0,0 +1,10 @@
+/**
+ * indexed_insert_long_fieldname_noindex.js
+ *
+ * Executes the indexed_insert_long_fieldname.js workload after dropping its index.
+ */
+load('jstests/concurrency/fsm_libs/runner.js'); // for extendWorkload
+load('jstests/concurrency/fsm_workloads/indexed_insert_long_fieldname.js'); // for $config
+load('jstests/concurrency/fsm_workload_helpers/indexed_noindex.js'); // for indexedNoindex
+
+var $config = extendWorkload($config, indexedNoindex);
diff --git a/jstests/parallel/fsm_workloads/indexed_insert_multikey.js b/jstests/concurrency/fsm_workloads/indexed_insert_multikey.js
index 825c08718f7..9ce0ce7daf1 100644
--- a/jstests/parallel/fsm_workloads/indexed_insert_multikey.js
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_multikey.js
@@ -5,8 +5,8 @@
* documents appear in both a collection scan and an index scan. The indexed
* value is an array of numbers.
*/
-load('jstests/parallel/fsm_libs/runner.js'); // for parseConfig
-load('jstests/parallel/fsm_workloads/indexed_insert_base.js'); // for $config
+load('jstests/concurrency/fsm_libs/runner.js'); // for parseConfig
+load('jstests/concurrency/fsm_workloads/indexed_insert_base.js'); // for $config
var $config = extendWorkload($config, function($config, $super) {
diff --git a/jstests/concurrency/fsm_workloads/indexed_insert_multikey_noindex.js b/jstests/concurrency/fsm_workloads/indexed_insert_multikey_noindex.js
new file mode 100644
index 00000000000..92d67c3aa61
--- /dev/null
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_multikey_noindex.js
@@ -0,0 +1,10 @@
+/**
+ * indexed_insert_multikey_noindex.js
+ *
+ * Executes the indexed_insert_multikey.js workload after dropping its index.
+ */
+load('jstests/concurrency/fsm_libs/runner.js'); // for extendWorkload
+load('jstests/concurrency/fsm_workloads/indexed_insert_multikey.js'); // for $config
+load('jstests/concurrency/fsm_workload_helpers/indexed_noindex.js'); // for indexedNoindex
+
+var $config = extendWorkload($config, indexedNoindex);
diff --git a/jstests/parallel/fsm_workloads/indexed_insert_ordered_bulk.js b/jstests/concurrency/fsm_workloads/indexed_insert_ordered_bulk.js
index 84d94c10e60..f02023ed7c5 100644
--- a/jstests/parallel/fsm_workloads/indexed_insert_ordered_bulk.js
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_ordered_bulk.js
@@ -6,8 +6,8 @@
*
* Uses an ordered, bulk operation to perform the inserts.
*/
-load('jstests/parallel/fsm_libs/runner.js'); // for extendWorkload
-load('jstests/parallel/fsm_workloads/indexed_insert_base.js'); // for $config
+load('jstests/concurrency/fsm_libs/runner.js'); // for extendWorkload
+load('jstests/concurrency/fsm_workloads/indexed_insert_base.js'); // for $config
var $config = extendWorkload($config, function($config, $super) {
diff --git a/jstests/parallel/fsm_workloads/indexed_insert_unordered_bulk.js b/jstests/concurrency/fsm_workloads/indexed_insert_unordered_bulk.js
index 468ddef6bf2..34f2618df8b 100644
--- a/jstests/parallel/fsm_workloads/indexed_insert_unordered_bulk.js
+++ b/jstests/concurrency/fsm_workloads/indexed_insert_unordered_bulk.js
@@ -6,8 +6,8 @@
*
* Uses an unordered, bulk operation to perform the inserts.
*/
-load('jstests/parallel/fsm_libs/runner.js'); // for extendWorkload
-load('jstests/parallel/fsm_workloads/indexed_insert_base.js'); // for $config
+load('jstests/concurrency/fsm_libs/runner.js'); // for extendWorkload
+load('jstests/concurrency/fsm_workloads/indexed_insert_base.js'); // for $config
var $config = extendWorkload($config, function($config, $super) {
diff --git a/jstests/parallel/fsm_workloads/update_inc.js b/jstests/concurrency/fsm_workloads/update_inc.js
index 8590cc91130..8590cc91130 100644
--- a/jstests/parallel/fsm_workloads/update_inc.js
+++ b/jstests/concurrency/fsm_workloads/update_inc.js
diff --git a/jstests/parallel/fsm_workloads/update_ordered_bulk_inc.js b/jstests/concurrency/fsm_workloads/update_ordered_bulk_inc.js
index 0dceb47f28b..0dceb47f28b 100644
--- a/jstests/parallel/fsm_workloads/update_ordered_bulk_inc.js
+++ b/jstests/concurrency/fsm_workloads/update_ordered_bulk_inc.js
diff --git a/jstests/parallel/fsm_workloads/indexed_insert_1char_noindex.js b/jstests/parallel/fsm_workloads/indexed_insert_1char_noindex.js
deleted file mode 100644
index 70c70c7e8d8..00000000000
--- a/jstests/parallel/fsm_workloads/indexed_insert_1char_noindex.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * indexed_insert_1char_noindex.js
- *
- * Executes the indexed_insert_1char.js workload after dropping its index.
- */
-load('jstests/parallel/fsm_libs/runner.js'); // for extendWorkload
-load('jstests/parallel/fsm_workloads/indexed_insert_1char.js'); // for $config
-load('jstests/parallel/fsm_workload_helpers/indexed_noindex.js'); // for indexedNoindex
-
-var $config = extendWorkload($config, indexedNoindex);
diff --git a/jstests/parallel/fsm_workloads/indexed_insert_base_noindex.js b/jstests/parallel/fsm_workloads/indexed_insert_base_noindex.js
deleted file mode 100644
index ebee79c20ca..00000000000
--- a/jstests/parallel/fsm_workloads/indexed_insert_base_noindex.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * indexed_insert_base_noindex.js
- *
- * Executes the indexed_insert_base.js workload after dropping its index.
- */
-load('jstests/parallel/fsm_libs/runner.js'); // for extendWorkload
-load('jstests/parallel/fsm_workloads/indexed_insert_base.js'); // for $config
-load('jstests/parallel/fsm_workload_helpers/indexed_noindex.js'); // for indexedNoindex
-
-var $config = extendWorkload($config, indexedNoindex);
diff --git a/jstests/parallel/fsm_workloads/indexed_insert_heterogeneous_noindex.js b/jstests/parallel/fsm_workloads/indexed_insert_heterogeneous_noindex.js
deleted file mode 100644
index 02a31d56356..00000000000
--- a/jstests/parallel/fsm_workloads/indexed_insert_heterogeneous_noindex.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * indexed_insert_heterogeneous_noindex.js
- *
- * Executes the indexed_insert_heterogeneous.js workload after dropping its index.
- */
-load('jstests/parallel/fsm_libs/runner.js'); // for extendWorkload
-load('jstests/parallel/fsm_workloads/indexed_insert_heterogeneous.js'); // for $config
-load('jstests/parallel/fsm_workload_helpers/indexed_noindex.js'); // for indexedNoindex
-
-var $config = extendWorkload($config, indexedNoindex);
diff --git a/jstests/parallel/fsm_workloads/indexed_insert_large_noindex.js b/jstests/parallel/fsm_workloads/indexed_insert_large_noindex.js
deleted file mode 100644
index 88350e6db08..00000000000
--- a/jstests/parallel/fsm_workloads/indexed_insert_large_noindex.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * indexed_insert_large_noindex.js
- *
- * Executes the indexed_insert_large.js workload after dropping its index.
- */
-load('jstests/parallel/fsm_libs/runner.js'); // for extendWorkload
-load('jstests/parallel/fsm_workloads/indexed_insert_large.js'); // for $config
-load('jstests/parallel/fsm_workload_helpers/indexed_noindex.js'); // for indexedNoindex
-
-var $config = extendWorkload($config, indexedNoindex);
diff --git a/jstests/parallel/fsm_workloads/indexed_insert_long_fieldname_noindex.js b/jstests/parallel/fsm_workloads/indexed_insert_long_fieldname_noindex.js
deleted file mode 100644
index 9c33b5ff876..00000000000
--- a/jstests/parallel/fsm_workloads/indexed_insert_long_fieldname_noindex.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * indexed_insert_long_fieldname_noindex.js
- *
- * Executes the indexed_insert_long_fieldname.js workload after dropping its index.
- */
-load('jstests/parallel/fsm_libs/runner.js'); // for extendWorkload
-load('jstests/parallel/fsm_workloads/indexed_insert_long_fieldname.js'); // for $config
-load('jstests/parallel/fsm_workload_helpers/indexed_noindex.js'); // for indexedNoindex
-
-var $config = extendWorkload($config, indexedNoindex);
diff --git a/jstests/parallel/fsm_workloads/indexed_insert_multikey_noindex.js b/jstests/parallel/fsm_workloads/indexed_insert_multikey_noindex.js
deleted file mode 100644
index f1b7d72405e..00000000000
--- a/jstests/parallel/fsm_workloads/indexed_insert_multikey_noindex.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * indexed_insert_multikey_noindex.js
- *
- * Executes the indexed_insert_multikey.js workload after dropping its index.
- */
-load('jstests/parallel/fsm_libs/runner.js'); // for extendWorkload
-load('jstests/parallel/fsm_workloads/indexed_insert_multikey.js'); // for $config
-load('jstests/parallel/fsm_workload_helpers/indexed_noindex.js'); // for indexedNoindex
-
-var $config = extendWorkload($config, indexedNoindex);