Permalink
Browse files

Merge branch 'master' of github.com:mongodb/mongo

  • Loading branch information...
2 parents 3043227 + ccd9961 commit 084bc36d4f5e724645a0b0c58324e27b67032b42 @dwight dwight committed Dec 26, 2011
Showing with 5 additions and 3 deletions.
  1. +2 −2 jstests/profile1.js
  2. +3 −1 src/mongo/dbtests/perftests.cpp
View
@@ -68,8 +68,8 @@ try {
assert.eq( 2 , db.system.profile.find( { "command.$eval" : /^sleep/ } ).count() );
- assert.lte( 120 , db.system.profile.findOne( { "command.$eval" : "sleep(120)" } ).millis );
- assert.lte( 25 , db.system.profile.findOne( { "command.$eval" : "sleep(25)" } ).millis );
+ assert.lte( 119 , db.system.profile.findOne( { "command.$eval" : "sleep(120)" } ).millis );
+ assert.lte( 24 , db.system.profile.findOne( { "command.$eval" : "sleep(25)" } ).millis );
/* sleep() could be inaccurate on certain platforms. let's check */
print("\nsleep 2 time actual:");
@@ -171,7 +171,9 @@ namespace PerfTests {
}
}
}
- catch(...) { }
+ catch(...) {
+ cout << "pstatsConnect() didn't work; ignoring" << endl;
+ }
}

0 comments on commit 084bc36

Please sign in to comment.