more reliable killop test

1 files changed, 2 insertions, 2 deletions

diff --git a/jstests/killop.js b/jstests/killop.js
index a458676fc0a..b0d5ea3bf07 100644
--- a/jstests/killop.js
+++ b/jstests/killop.js
@@ -4,7 +4,7 @@ t.drop();
 //if ( typeof _threadInject == "undefined" ) { // don't run in v8 mode - SERVER-1900
 
 function debug( x ) {
-    printjson( x );
+    //printjson( x );
 }
 
 t.save( {} );
@@ -19,7 +19,7 @@ function ops() {
         // We *can't* check for ns, b/c it's not guaranteed to be there unless the query is active, which 
         // it may not be in our polling cycle - particularly b/c we sleep every second in both the query and
         // the assert
-        if ( o.active && o.query && o.query.query && o.query.query.$where && o.query.count == "jstests_killop" ) {
+        if ( ( o.active || o.waitingForLock ) && o.query && o.query.query && o.query.query.$where && o.query.count == "jstests_killop" ) {
             ids.push( o.opid );
         }
     }