From 582fc32574a3b158c81e49cb00e6ae59205e66ba Mon Sep 17 00:00:00 2001
From: Antonin Kral <a.kral@bobek.cz>
Date: Thu, 17 Mar 2011 00:05:43 +0100
Subject: Imported Upstream version 1.8.0

---
 jstests/rs/rs_basic.js | 88 +++++++++++++++++++++++++-------------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

(limited to 'jstests/rs/rs_basic.js')

diff --git a/jstests/rs/rs_basic.js b/jstests/rs/rs_basic.js
index 08de689..e8d124d 100644
--- a/jstests/rs/rs_basic.js
+++ b/jstests/rs/rs_basic.js
@@ -1,51 +1,51 @@
 // rs_basic.js
 
-load("../../jstests/rs/test_framework.js");
-
-function go() {
-    assert(__nextPort == 27000, "_nextPort==27000");
-
-    a = null;
-    try {init
-        a = new Mongo("localhost:27000");
-        print("using already open mongod on port 27000 -- presume you are debugging or something. should start empty.");
-        __nextPort++;
-    }
-    catch (e) {
-        a = rs_mongod();
-    }
-
+load("../../jstests/rs/test_framework.js");
+
+function go() {
+    assert(__nextPort == 27000, "_nextPort==27000");
+
+    a = null;
+    try {init
+        a = new Mongo("localhost:27000");
+        print("using already open mongod on port 27000 -- presume you are debugging or something. should start empty.");
+        __nextPort++;
+    }
+    catch (e) {
+        a = rs_mongod();
+    }
+
     b = rs_mongod();
 
-    x = a.getDB("admin");
-    y = b.getDB("admin");
-    memb = [];
-    memb[0] = x;
-    memb[1] = y;
-
-    print("rs_basic.js go(): started 2 servers");
-
-    cfg = { _id: 'asdf', members: [] };
-    var hn = hostname();
-    cfg.members[0] = { _id: 0, host: hn + ":27000" };
-    cfg.members[1] = { _id: 1, host: hn + ":27001" };
-
+    x = a.getDB("admin");
+    y = b.getDB("admin");
+    memb = [];
+    memb[0] = x;
+    memb[1] = y;
+
+    print("rs_basic.js go(): started 2 servers");
+
+    cfg = { _id: 'asdf', members: [] };
+    var hn = hostname();
+    cfg.members[0] = { _id: 0, host: hn + ":27000" };
+    cfg.members[1] = { _id: 1, host: hn + ":27001" };
+
     print("cfg=" + tojson(cfg));
-}
-
-function init(server) {
-    var i = server;
-    //i = Random.randInt(2); // a random member of the set
-    var m = memb[i];
-    assert(!m.ismaster(), "not ismaster");
-    var res = m.runCommand({ replSetInitiate: cfg });
-    return res;
-}
-
-_path = '../../db/Debug/';
-print("_path var set to " + _path);
-
-print("go() to run");
+}
+
+function init(server) {
+    var i = server;
+    //i = Random.randInt(2); // a random member of the set
+    var m = memb[i];
+    assert(!m.ismaster(), "not ismaster");
+    var res = m.runCommand({ replSetInitiate: cfg });
+    return res;
+}
+
+_path = '../../db/Debug/';
+print("_path var set to " + _path);
+
+print("go() to run");
 print("init() to initiate");
 
 
@@ -108,7 +108,7 @@ r = function( key , v ){
 correct = { a : 2 , b : 1 };
 
 function checkMR( t ){
-    var res = t.mapReduce( m , r );
+    var res = t.mapReduce( m , r , "xyz" );
     assert.eq( correct , res.convertToSingleObject() , "checkMR: " + tojson( t ) );
 }
 
-- 
cgit v1.2.3