SERVER-7122 Fix tests now that $eval requires full admin access

1 files changed, 14 insertions, 15 deletions

diff --git a/jstests/auth/auth1.js b/jstests/auth/auth1.js
index e1de19fd49b..a1c4d95ebeb 100644
--- a/jstests/auth/auth1.js
+++ b/jstests/auth/auth1.js
@@ -32,21 +32,17 @@ assert.eq(db.adminCommand({getLog : "global"}).errmsg, errmsg);
 
 assert( db.auth( "eliot" , "eliot" ) , "auth failed" );
 
-for( i = 0; i < 999; ++i ) {
+for( i = 0; i < 1000; ++i ) {
     t.save( {i:i} );
 }
-assert.eq( 999, t.count() , "A1" );
-assert.eq( 999, t.find().toArray().length , "A2" );
+assert.eq( 1000, t.count() , "A1" );
+assert.eq( 1000, t.find().toArray().length , "A2" );
 
 db.setProfilingLevel( 2 );
 t.count();
 db.setProfilingLevel( 0 );
 assert.lt( 0 , db.system.profile.find( { user : "eliot" } ).count() , "AP1" )
 
-assert.eq( 999, db.eval( function() { return db[ "jstests_auth_auth1" ].count(); } ) , "A3" );
-db.eval( function() { db[ "jstests_auth_auth1" ].save( {i:999} ) } );
-assert.eq( 1000, db.eval( function() { return db[ "jstests_auth_auth1" ].count(); } ) , "A4" );
-
 var p = { key : { i : true } , 
     reduce : function(obj,prev) { prev.count++; },
 initial: { count: 0 }
@@ -75,12 +71,7 @@ assert.throws(function(){dbRO.addUser( "a", "b" )});
 assert( dbRO.getLastError() , "B9" );
 assert.eq( 2, db.system.users.count() , "B10"); // rw connection
 
-assert.eq( 1000, dbRO.eval( function() { return db[ "jstests_auth_auth1" ].count(); } ) , "C1" );
-assert.eq( 1000, dbRO.eval( function() { return db[ "jstests_auth_auth1" ].find().toArray().length; } ) , "C2" );
-dbRO.eval( function() { db[ "jstests_auth_auth1" ].save( {i:1} ) } , "C3" );
-assert.eq( 1000, dbRO.eval( function() { return db[ "jstests_auth_auth1" ].count(); } ) , "C4" );
-
-assert.eq( 1000, tRO.group( p ).length , "C5" );
+assert.eq( 1000, tRO.group( p ).length , "C1" );
 
 var p = { key : { i : true } , 
           reduce : function(obj,prev) { db.jstests_auth_auth1.save( {i:10000} ); prev.count++; },
@@ -89,7 +80,15 @@ var p = { key : { i : true } ,
 
 // this no longer throws (but the saves silently fail) SERVER-5228
 //assert.throws( function() { return t.group( p ) }, null , "write reduce didn't fail" );
-assert.eq( 1000, tRO.group( p ).length , "C6" );
-assert.eq( 1000, dbRO.jstests_auth_auth1.count() , "C7" );
+assert.eq( 1000, tRO.group( p ).length , "C2" );
+assert.eq( 1000, dbRO.jstests_auth_auth1.count() , "C3" );
+
+
+db.getSiblingDB('admin').auth('super', 'super');
+
+assert.eq( 1000, db.eval( function() { return db[ "jstests_auth_auth1" ].count(); } ) , "D1" );
+db.eval( function() { db[ "jstests_auth_auth1" ].save( {i:1000} ) } );
+assert.eq( 1001, db.eval( function() { return db[ "jstests_auth_auth1" ].count(); } ) , "D2" );
+
 
 print("SUCCESS auth1.js");