SERVER-1861 give test more opportunity to find eval op id

1 files changed, 5 insertions, 4 deletions

diff --git a/jstests/evald.js b/jstests/evald.js
index 88566a19585..84354826126 100644
--- a/jstests/evald.js
+++ b/jstests/evald.js
@@ -57,10 +57,11 @@ doIt( "db.jstests_evald.count( { $where: function() { while( 1 ) { ; } } } )", t
 doIt( "db.jstests_evald.count( { $where: function() { while( 1 ) { ; } } } )", false, true );
 doIt( "while( true ) {;}", false );
 doIt( "while( true ) {;}", true );
-doIt( "while( 1 ) { db.jstests_evald.count( {i:10} ); }", true );
-doIt( "while( 1 ) { db.jstests_evald.count( {i:10} ); }", false );
-doIt( "while( 1 ) { db.jstests_evald.count(); }", true );
-doIt( "while( 1 ) { db.jstests_evald.count(); }", false );
+// the for loops are currently required, as a spawned op masks the parent op - see SERVER-1844
+doIt( "while( 1 ) { for( var i = 0; i < 10000; ++i ) {;} db.jstests_evald.count( {i:10} ); }", true );
+doIt( "while( 1 ) { for( var i = 0; i < 10000; ++i ) {;} db.jstests_evald.count( {i:10} ); }", false );
+doIt( "while( 1 ) { for( var i = 0; i < 10000; ++i ) {;} db.jstests_evald.count(); }", true );
+doIt( "while( 1 ) { for( var i = 0; i < 10000; ++i ) {;} db.jstests_evald.count(); }", false );
 
 // these two are SERVER-1841
 //doIt( "while( 1 ) { try { db.jstests_evald.count( {i:10} ); } catch ( e ) { } }", true );