summaryrefslogtreecommitdiff
path: root/jstests/core
diff options
context:
space:
mode:
authorScott Hernandez <scotthernandez@gmail.com>2014-02-04 07:44:16 -0500
committerScott Hernandez <scotthernandez@gmail.com>2014-02-04 15:16:54 -0500
commitedfce78fcb8ab6abfe5224bd5678b8c11b5978d2 (patch)
tree148884c8ee10201e4ce8dcf3b4feceb6283a6e30 /jstests/core
parent71219e3fa67520e1e0c93cbcdeaee2354d81cd9e (diff)
downloadmongo-edfce78fcb8ab6abfe5224bd5678b8c11b5978d2.tar.gz
rename bulk api stuff to bulk (not batch)
Diffstat (limited to 'jstests/core')
-rw-r--r--jstests/core/batch_write_command_wc.js18
-rw-r--r--jstests/core/bulk_api_ordered.js (renamed from jstests/core/batch_api_ordered.js)2
-rw-r--r--jstests/core/bulk_api_unordered.js (renamed from jstests/core/batch_api_unordered.js)4
3 files changed, 21 insertions, 3 deletions
diff --git a/jstests/core/batch_write_command_wc.js b/jstests/core/batch_write_command_wc.js
new file mode 100644
index 00000000000..0a5bf120fa0
--- /dev/null
+++ b/jstests/core/batch_write_command_wc.js
@@ -0,0 +1,18 @@
+//
+// Ensures that the server respects the batch write command WriteConcern, and behaves correctly
+//
+
+
+
+var coll = db.getCollection( "batch_write_wc" );
+coll.drop();
+
+jsTest.log("Starting Tests");
+
+// Basic validation of WriteConcern
+// -- {}, versus {w:0}/{w:1} +opt wTimeout
+// -- j:1, fsync:1,
+// -- replication: w:N (>1), w:String, wTimeout
+// -- randomField:true, etc
+
+
diff --git a/jstests/core/batch_api_ordered.js b/jstests/core/bulk_api_ordered.js
index f0bc2d1781b..ee8bc9bdeef 100644
--- a/jstests/core/batch_api_ordered.js
+++ b/jstests/core/bulk_api_ordered.js
@@ -1,5 +1,5 @@
-var collectionName = "batch_api_ordered";
+var collectionName = "bulk_api_ordered";
var coll = db.getCollection(collectionName);
coll.drop();
diff --git a/jstests/core/batch_api_unordered.js b/jstests/core/bulk_api_unordered.js
index 37b2b767bd8..218cc1a9cb4 100644
--- a/jstests/core/batch_api_unordered.js
+++ b/jstests/core/bulk_api_unordered.js
@@ -1,11 +1,11 @@
-var collectionName = "batch_api_unordered";
+var collectionName = "bulk_api_unordered";
var coll = db.getCollection(collectionName);
coll.drop();
var request;
var result;
-jsTest.log("Starting batch api unordered tests...");
+jsTest.log("Starting bulk api unordered tests...");
/********************************************************
*