SERVER-5516 SERVER-5304 SERVER-6577 new capped collections now get _id index by default (except in local db)

1 files changed, 4 insertions, 4 deletions

diff --git a/jstests/queryoptimizera.js b/jstests/queryoptimizera.js
index a7d520c15d8..f26c2b0978c 100644
--- a/jstests/queryoptimizera.js
+++ b/jstests/queryoptimizera.js
@@ -52,9 +52,9 @@ function assertNewWarning() {
     oldNumWarnings = newNumWarnings;
 }
 
-// Simple _id query without an _id index.
+// Simple _id query
 t.find( { _id:0 } ).itcount();
-assertNewWarning();
+assertNoNewWarnings();
 
 // Simple _id query without an _id index, on a non capped collection.
 notCapped.find( { _id:0 } ).itcount();
@@ -62,7 +62,7 @@ assertNoNewWarnings();
 
 // A multi field query, including _id.
 t.find( { _id:0, a:0 } ).itcount();
-assertNewWarning();
+assertNoNewWarnings();
 
 // An unsatisfiable query.
 t.find( { _id:0, a:{$in:[]} } ).itcount();
@@ -74,7 +74,7 @@ assertNoNewWarnings();
 
 // Retry a multi field query.
 t.find( { _id:0, a:0 } ).itcount();
-assertNewWarning();
+assertNoNewWarnings();
 
 // Warnings should not be printed when an index is added on _id.
 t.ensureIndex( { _id:1 } );