summaryrefslogtreecommitdiff
path: root/jstests
diff options
context:
space:
mode:
authorJ Delaney <j.delaney@mongodb.com>2015-07-09 19:59:55 -0400
committerMax Hirschhorn <max.hirschhorn@mongodb.com>2015-07-09 19:59:55 -0400
commit3fb61fcb76c46c4714e62c119ef6e3222375715e (patch)
tree68ab1383ce80335bafccc5a61dde57fb07402d61 /jstests
parenteb8125a99950a64773e0215fee5af6de229c94f2 (diff)
downloadmongo-3fb61fcb76c46c4714e62c119ef6e3222375715e.tar.gz
SERVER-19325 Remove duplicate properties from objects in JS tests
Closes #998. Signed-off-by: Max Hirschhorn <max.hirschhorn@mongodb.com>
Diffstat (limited to 'jstests')
-rw-r--r--jstests/core/cursor7.js2
-rw-r--r--jstests/core/mr1.js2
-rw-r--r--jstests/core/update6.js4
-rw-r--r--jstests/sharding/key_string.js2
4 files changed, 4 insertions, 6 deletions
diff --git a/jstests/core/cursor7.js b/jstests/core/cursor7.js
index 97cfbb738b3..336beafaa90 100644
--- a/jstests/core/cursor7.js
+++ b/jstests/core/cursor7.js
@@ -24,12 +24,10 @@ function testMultipleInequalities( db ) {
checkResults( [ z[ 2 ], z[ 3 ] ], r.find( { a: { $gt: 3 } } ).sort( idx ).hint( idx ) );
checkResults( [ z[ 2 ] ], r.find( { a: { $gt: 3, $lt: 7 } } ).sort( idx ).hint( idx ) );
- checkResults( [ z[ 2 ] ], r.find( { a: { $gt: 1, $lt: 7, $gt: 3 } } ).sort( idx ).hint( idx ) );
checkResults( [ z[ 2 ] ], r.find( { a: { $gt: 3, $lt: 7, $lte: 5 } } ).sort( idx ).hint( idx ) );
checkResults( [ z[ 3 ], z[ 2 ] ], r.find( { a: { $gt: 3 } } ).sort( rIdx ).hint( idx ) );
checkResults( [ z[ 2 ] ], r.find( { a: { $gt: 3, $lt: 7 } } ).sort( rIdx ).hint( idx ) );
- checkResults( [ z[ 2 ] ], r.find( { a: { $gt: 1, $lt: 7, $gt: 3 } } ).sort( rIdx ).hint( idx ) );
checkResults( [ z[ 2 ] ], r.find( { a: { $gt: 3, $lt: 7, $lte: 5 } } ).sort( rIdx ).hint( idx ) );
checkResults( [ z[ 1 ], z[ 2 ] ], r.find( { a: { $gt: 1, $lt: 7, $gte: 3, $lte: 5 }, b: { $gt: 2, $lt: 8, $gte: 4, $lte: 6 } } ).sort( idx ).hint( idx ) );
diff --git a/jstests/core/mr1.js b/jstests/core/mr1.js
index 33390a6187a..9fdf48babdb 100644
--- a/jstests/core/mr1.js
+++ b/jstests/core/mr1.js
@@ -166,7 +166,7 @@ if ( true ){
}
x.drop();
- res = db.runCommand( { mapreduce : "mr1" , out : "mr1_foo" , map : m2 , reduce : r2 , out : "mr1_out" } );
+ res = db.runCommand( { mapreduce : "mr1" , out : "mr1_out" , map : m2 , reduce : r2 } );
d(res);
print( "t3: " + res.timeMillis + " (~3500 on 2.8ghz)" );
diff --git a/jstests/core/update6.js b/jstests/core/update6.js
index 05fc5b223d9..23d5846c206 100644
--- a/jstests/core/update6.js
+++ b/jstests/core/update6.js
@@ -17,7 +17,7 @@ assert.docEq( { "c" : 2, "d" : 1, "0e" : 1 }, t.findOne().b, "D" );
t.drop();
t.save( {"_id" : 2 ,
- "b3" : {"0720" : 5 , "0721" : 12 , "0722" : 11 , "0723" : 3 , "0721" : 12} ,
+ "b3" : {"0720" : 5 , "0721" : 12 , "0722" : 11 , "0723" : 3} ,
//"b323" : {"0720" : 1} ,
}
);
@@ -33,7 +33,7 @@ assert.eq( 5 , Object.keySet( t.find({_id:2},{b3:1})[0].b3 ).length , "test 1 :
t.drop();
t.save( {"_id" : 2 ,
- "b3" : {"0720" : 5 , "0721" : 12 , "0722" : 11 , "0723" : 3 , "0721" : 12} ,
+ "b3" : {"0720" : 5 , "0721" : 12 , "0722" : 11 , "0723" : 3} ,
"b324" : {"0720" : 1} ,
}
);
diff --git a/jstests/sharding/key_string.js b/jstests/sharding/key_string.js
index 2b15e657497..7434b75e52f 100644
--- a/jstests/sharding/key_string.js
+++ b/jstests/sharding/key_string.js
@@ -26,7 +26,7 @@ s.adminCommand({ split: "test.foo", middle: { name: "allan" }});
s.adminCommand({ split: "test.foo", middle: { name: "sara" }});
s.adminCommand({ split: "test.foo", middle: { name: "eliot" }});
-s.adminCommand( { movechunk : "test.foo" , find : { name : "eliot" } , to : seconday.getMongo().name, _waitForDelete : true, _waitForDelete : true } );
+s.adminCommand( { movechunk : "test.foo" , find : { name : "eliot" } , to : seconday.getMongo().name, _waitForDelete : true } );
s.printChunks();