CXX 440 no need for 2.2 fallback if test is not run on 2.2

amidvidy · amidvidy · commit 0528245fac7d · 2015-01-22T16:42:04.000-05:00
diff --git a/src/mongo/integration/standalone/dbclient_test.cpp b/src/mongo/integration/standalone/dbclient_test.cpp
@@ -1414,11 +1414,7 @@ namespace {
         if (serverGTE(&c, 2, 4) && (!serverGTE(&c, 2, 7) || kCompiledWithSSL)) {
             createUser(c, TEST_DB, "user3", "password3");
             std::string errmsg;
-            try {
-                ASSERT_FALSE(c.auth("test", "user3", "notPassword3", errmsg));
-            } catch (const DBException&) {
-                //Expected on 2.2
-            }
+            ASSERT_FALSE(c.auth("test", "user3", "notPassword3", errmsg));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1414,11 +1414,7 @@ namespace {`
`1414`	`1414`	`if (serverGTE(&c, 2, 4) && (!serverGTE(&c, 2, 7) \|\| kCompiledWithSSL)) {`
`1415`	`1415`	`createUser(c, TEST_DB, "user3", "password3");`
`1416`	`1416`	`std::string errmsg;`
`1417`		`- try {`
`1418`		`- ASSERT_FALSE(c.auth("test", "user3", "notPassword3", errmsg));`
`1419`		`- } catch (const DBException&) {`
`1420`		`- //Expected on 2.2`
`1421`		`- }`
	`1417`	`+ ASSERT_FALSE(c.auth("test", "user3", "notPassword3", errmsg));`
`1422`	`1418`	`}`
`1423`	`1419`	`}`
`1424`	`1420`