summaryrefslogtreecommitdiff
path: root/jstests/currentop.js
diff options
context:
space:
mode:
authorEric Milkie <milkie@10gen.com>2012-03-19 16:14:26 -0400
committerEric Milkie <milkie@10gen.com>2012-03-19 16:14:51 -0400
commit8d7682b0af08bc4f119d86cd0131648c1b8b19ed (patch)
tree6a5f7345990ed5715ff99001a293fc975fe9c21b /jstests/currentop.js
parent3bb208a86d6173775bd1d0b3840fbcec6c2ca962 (diff)
downloadmongo-8d7682b0af08bc4f119d86cd0131648c1b8b19ed.tar.gz
fix currentOp.js test to work with both --mongod-concurrency-level settings
Diffstat (limited to 'jstests/currentop.js')
-rw-r--r--jstests/currentop.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/jstests/currentop.js b/jstests/currentop.js
index 5143227942a..4eced678d39 100644
--- a/jstests/currentop.js
+++ b/jstests/currentop.js
@@ -35,8 +35,9 @@ print()
// need to wait for read to start
print("wait have some ops");
assert.soon( function(){
- return ops( { "lockType": "r", "ns": "test.jstests_currentop" } ).length >= 1;
- }, "have_some_ops");
+ return ops( { "lockType": "r", "ns": "test.jstests_currentop" } ).length +
+ ops({ "lockType": "R", "ns": "test.jstests_currentop" }).length >= 1;
+}, "have_some_ops");
print("ok");
s2 = startParallelShell( "db.jstests_currentop.update( { '$where': function() { sleep(1000); } }, { 'num': 1 }, false, true )" );