SERVER-17185 improve error handling in replsets/auth1.js

(cherry picked from commit 9399c2c04c0fcfa3ab1b2150c62ff75682d116a2)

1 files changed, 4 insertions, 12 deletions

diff --git a/jstests/replsets/auth1.js b/jstests/replsets/auth1.js
index 0b004b57318..989c55b7ef1 100644
--- a/jstests/replsets/auth1.js
+++ b/jstests/replsets/auth1.js
@@ -70,19 +70,11 @@ assert.eq(r.x, 1);
 slave.setSlaveOk();
 
 function doQueryOn(p) {
-    var err = {};
-    try {
+    var error = assert.throws( function() {
         r = p.getDB("test").foo.findOne();
-    }
-    catch(e) {
-        if (typeof(JSON) != "undefined") {
-            err = JSON.parse(e.message.substring(6));
-        }
-        else if (e.indexOf("13") > 0) {
-            err.code = 13;
-        }
-    }
-    assert.eq(err.code, 13);
+    }, [], "find did not throw, returned: " + tojson(r)).toString();
+    printjson(error);
+    assert.gt(error.indexOf("not authorized for query on test.foo"), -1, "error was non-auth");
 };
 
 doQueryOn(slave);