SERVER-35804 Disallow dropping config and admin from mongos

1 files changed, 4 insertions, 14 deletions

diff --git a/jstests/sharding/drop_configdb.js b/jstests/sharding/drop_configdb.js
index 180741530b9..5e2b704cf6d 100644
--- a/jstests/sharding/drop_configdb.js
+++ b/jstests/sharding/drop_configdb.js
@@ -3,17 +3,9 @@
 (function() {
 "use strict";
 
-var getConfigsvrToWriteTo = function(st) {
-    if (st.configRS) {
-        return st.configRS.getPrimary();
-    } else {
-        return st._configServers[0];
-    }
-};
-
 var st = new ShardingTest({shards: 2});
 var mongos = st.s;
-var config = getConfigsvrToWriteTo(st).getDB('config');
+var config = st.configRS.getPrimary().getDB('config');
 
 // Try to drop config db via configsvr
 
@@ -26,10 +18,8 @@ assert.eq("Cannot drop 'config' database if mongod started with --configsvr",
 var config = mongos.getDB("config");
 
 print("1: Try to drop config database via mongos");
-assert.eq(0, config.dropDatabase().ok);
-
-// 20 = ErrorCodes::IllegalOperation
-assert.eq(20, config.dropDatabase().code);
+assert.commandFailedWithCode(config.dropDatabase(), ErrorCodes.IllegalOperation);
+assert.commandFailedWithCode(mongos.getDB("admin").dropDatabase(), ErrorCodes.IllegalOperation);
 
 st.stop();
-}());
\ No newline at end of file
+}());