CXX-440 Fix tests for 2.2

Author: spencerjackson

src/mongo/client/examples/authTest.cpp

@@ -31,6 +31,18 @@
 
 using namespace mongo;
 
+bool serverLTE(DBClientBase* c, int major, int minor) {
+    BSONObj result;
+    c->runCommand("admin", BSON("buildinfo" << true), result);
+
+    std::vector<BSONElement> version = result.getField("versionArray").Array();
+    int serverMajor = version[0].Int();
+    int serverMinor = version[1].Int();
+
+    return (serverMajor <= major && serverMinor <= minor);
+}
+
+
 int main( int argc, const char **argv ) {
 
     using std::cout;
@@ -95,9 +107,15 @@ int main( int argc, const char **argv ) {
         return EXIT_FAILURE;
     }
 
-    if (conn->auth("test", "eliot", "bars", errmsg)) { // incorrect password
-        cout << "Authentication with invalid password should have failed but didn't" << endl;
-        return EXIT_FAILURE;
+    try {
+        if (conn->auth("test", "eliot", "bars", errmsg)) { // incorrect password
+            cout << "Authentication with invalid password should have failed but didn't" << endl;
+            return EXIT_FAILURE;
+        }
+    } catch (const DBException&) {
+        //Expected on v2.2 and below
+        assert(serverLTE(conn.get(), 2, 2));
     }
+
     return EXIT_SUCCESS;
 }

src/mongo/integration/replica_set/read_preference.cpp

@@ -94,7 +94,7 @@ namespace {
 
     void count(const auto_ptr<DBClientReplicaSet>& test_conn, ReadPreference rp) {
         Query q = Query().readPref(rp, BSONArray());
-        test_conn->count(TEST_NS, q);
+        test_conn->count(TEST_NS, q, QueryOption_SlaveOk);
     }
 
     void distinct(const auto_ptr<DBClientReplicaSet>& test_conn, ReadPreference rp) {

src/mongo/integration/standalone/dbclient_test.cpp

@@ -1414,7 +1414,11 @@ namespace {
         if (serverGTE(&c, 2, 4) && (!serverGTE(&c, 2, 7) || kCompiledWithSSL)) {
             createUser(c, TEST_DB, "user3", "password3");
             std::string errmsg;
-            ASSERT_FALSE(c.auth("test", "user3", "notPassword3", errmsg));
+            try {
+                ASSERT_FALSE(c.auth("test", "user3", "notPassword3", errmsg));
+            } catch (const DBException&) {
+                //Expected on 2.2
+            }
         }
     }