Imported Upstream version 2.0.0

1 files changed, 11 insertions, 1 deletions

diff --git a/jstests/sharding/shard3.js b/jstests/sharding/shard3.js
index 7132563..e27316e 100644
--- a/jstests/sharding/shard3.js
+++ b/jstests/sharding/shard3.js
@@ -4,9 +4,18 @@ s = new ShardingTest( "shard3" , 2 , 1 , 2 );
 
 s2 = s._mongos[1];
 
+db = s.getDB( "test" )
 s.adminCommand( { enablesharding : "test" } );
 s.adminCommand( { shardcollection : "test.foo" , key : { num : 1 } } );
 
+assert( sh.getBalancerState() , "A1" )
+sh.setBalancerState( false ) 
+assert( ! sh.getBalancerState() , "A2" )
+sh.setBalancerState( true ) 
+assert( sh.getBalancerState() , "A3" )
+sh.setBalancerState( false )
+assert( ! sh.getBalancerState() , "A4" )
+
 s.config.databases.find().forEach( printjson )
 
 a = s.getDB( "test" ).foo;
@@ -53,6 +62,7 @@ function doCounts( name , total , onlyItCounts ){
 
 var total = doCounts( "before wrong save" )
 secondary.save( { num : -3 } );
+printjson( secondary.getDB().getLastError() )
 doCounts( "after wrong save" , total , true )
 e = a.find().explain();
 assert.eq( 3 , e.n , "ex1" )
@@ -127,7 +137,7 @@ print( "*** ready to call dropDatabase" )
 res = s.getDB( "test" ).dropDatabase();
 assert.eq( 1 , res.ok , "dropDatabase failed : " + tojson( res ) );
 // Waiting for SERVER-2253
-// assert.eq( 0 , s.config.databases.count( { _id: "test" } ) , "database 'test' was dropped but still appears in configDB" );
+assert.eq( 0 , s.config.databases.count( { _id: "test" } ) , "database 'test' was dropped but still appears in configDB" );
 
 s.printShardingStatus();
 s.printCollectionInfo( "test.foo" , "after dropDatabase call 1" );