chunk tests

Author: Kristina Chodorow

.gitignore

@@ -0,0 +1,2 @@
+*~
+*.log

handlers.py

@@ -1,6 +1,6 @@
 from pymongo import Connection, json_util
 from pymongo.son import SON
-from pymongo.errors import ConnectionFailure
+from pymongo.errors import ConnectionFailure, OperationFailure
 
 import re
 import json
@@ -57,8 +57,12 @@ def _cmd(self, args, out):
                 temp[pair['key']] = pair['value']
             cmd = temp
 
-        result = connection.admin._command(cmd)
-        out(json.dumps(result, default=json_util.default))
+        try:
+            result = connection.admin._command(cmd)
+            out(json.dumps(result, default=json_util.default))
+        except OperationFailure as err:
+            out('{"ok" : 0, "msg" : "operation failed but you\'ll never know why."}')
+
 
 
     def _mongos(self, args, out):

scripts/mongoose.js

@@ -390,7 +390,7 @@ Mongoose.Collection = function(db, collection) {
      * Enables sharding on this collection.  The collection's database must have 
      * sharding enabled before it can be enabled on the collection.
      *
-     * @param {object} key the field on which to shard
+     * @param {object} key the field or fields on which to shard, e.g., {"x" : 1}
      * @param {boolean} [unique] if the shard key should be unique
      * @param {function} [callback] optional function to call when a response is
      * received.

test/tests.js

@@ -72,19 +72,21 @@ m.setMongos(testSetMongos);
 var testGetConfig = function(msg) {
     test("get config", function() {
             expect(2);
-
+            
             equals(msg.configserver, "localhost:20000");
             equals(msg.isdbgrid, 1);
+            
         });
 };
 m.getConfig(testGetConfig);
 
+
 var addShards = true;
 
 var testGetShards0 = function(msg) {
     test("get shards 0", function() {
             expect(1);
-
+            
             // no shards yet
             ok(msg.shards.constructor == Array);
             if (msg.shards.length == 2) {
@@ -94,6 +96,10 @@ var testGetShards0 = function(msg) {
 };
 m.getShards(testGetShards0);
 
+
+
+
+
 module("Mongoose Shards");
 
 shard0 = new Mongoose.Shard(m, "localhost:10000");
@@ -198,7 +204,7 @@ var testMoveDB = function(msg) {
 }
 
 var testGetDBs2 = function(msg) {
-    test("get dbs", function() {
+    test("get dbs 2", function() {
             expect(2);
 
             equals(msg.dbs.constructor, Array);
@@ -222,6 +228,7 @@ shard1.getDatabases(testGetDBs2);
 
 
 
+
 module("Mongoose Collections");
 
 c = new Mongoose.Collection(db, "bar");
@@ -231,4 +238,34 @@ test("instance vars", function() {
         equals(c.ns, "foo.bar");
     });
 
+var testShardColl = function(msg) {
+    test("shard collection", function() {
+
+        });
+};
+c.shard({"_id" : 1}, true, testShardColl);
+c.shard({"x" : 1}, false, testShardColl);
+
+var testSplitChunk = function(msg) {
+    test("split chunk", function() {
+
+        });
+}
+c.split({"find" : {"x" : 1}}, testSplitChunk);
+
+var testMoveChunk = function(msg) {
+    test("move chunk", function() {
+
+        });
+}
+
+
+var testGetVersion = function(msg) {
+    test("version", function() {
+            expect(0);
+
+        });
+}
+c.version(testGetVersion);
 
+Mongoose.debug = false;