CXX-897 Account for SERVER-22041 changes in test

acmorrow · acmorrow · commit a95f89aa9cb1 · 2016-04-18T15:28:09.000-04:00
diff --git a/src/mongo/integration/standalone/dbclient_test.cpp b/src/mongo/integration/standalone/dbclient_test.cpp
@@ -1051,7 +1051,12 @@ TEST_F(DBClientTest, CountWithHint) {
         ASSERT_NO_THROW(c->count(TEST_NS, bad));
     }
 
-    ASSERT_EQUALS(c->count(TEST_NS, Query().hint("b_1")), 2U);
+    // In 3.3, the behavior here changed, see SERVER-22041 for details.
+    if (serverGTE(c.get(), 3, 3)) {
+        ASSERT_EQUALS(c->count(TEST_NS, Query().hint("b_1")), 0U);
+    } else {
+        ASSERT_EQUALS(c->count(TEST_NS, Query().hint("b_1")), 2U);
+    }
 }
 
 TEST_F(DBClientTest, CopyDatabaseNoAuth) {

Original file line number	Diff line number	Diff line change
`@@ -1051,7 +1051,12 @@ TEST_F(DBClientTest, CountWithHint) {`
`1051`	`1051`	`ASSERT_NO_THROW(c->count(TEST_NS, bad));`
`1052`	`1052`	`}`
`1053`	`1053`
`1054`		`- ASSERT_EQUALS(c->count(TEST_NS, Query().hint("b_1")), 2U);`
	`1054`	`+ // In 3.3, the behavior here changed, see SERVER-22041 for details.`
	`1055`	`+ if (serverGTE(c.get(), 3, 3)) {`
	`1056`	`+ ASSERT_EQUALS(c->count(TEST_NS, Query().hint("b_1")), 0U);`
	`1057`	`+ } else {`
	`1058`	`+ ASSERT_EQUALS(c->count(TEST_NS, Query().hint("b_1")), 2U);`
	`1059`	`+ }`
`1055`	`1060`	`}`
`1056`	`1061`
`1057`	`1062`	`TEST_F(DBClientTest, CopyDatabaseNoAuth) {`