diff options
author | Andrew Morrow <acm@mongodb.com> | 2018-05-23 19:38:59 -0400 |
---|---|---|
committer | Andrew Morrow <acm@mongodb.com> | 2018-05-25 14:46:07 -0400 |
commit | b63adc38fc934def5fd7463e390f21ad3bdedffb (patch) | |
tree | 88fa2c970dd014ee2031da501a62a650cb845639 /src/mongo/client | |
parent | d830da4c2702c31d252babe3412594e3036fe0f9 (diff) | |
download | mongo-b63adc38fc934def5fd7463e390f21ad3bdedffb.tar.gz |
SERVER-33889 Remove auditing command from embedded
(cherry picked from commit b322ee9200172276b8d4935c623728129d62c3ef)
Diffstat (limited to 'src/mongo/client')
-rw-r--r-- | src/mongo/client/embedded/embedded_transport_layer_test.cpp | 1 | ||||
-rw-r--r-- | src/mongo/client/embedded/libmongodbcapi_test.cpp | 121 |
2 files changed, 60 insertions, 62 deletions
diff --git a/src/mongo/client/embedded/embedded_transport_layer_test.cpp b/src/mongo/client/embedded/embedded_transport_layer_test.cpp index f0ec982eee8..a256cb75f32 100644 --- a/src/mongo/client/embedded/embedded_transport_layer_test.cpp +++ b/src/mongo/client/embedded/embedded_transport_layer_test.cpp @@ -221,7 +221,6 @@ int main(int argc, char** argv, char** envp) { } mongoc_cleanup(); - globalTempDir.reset(); mongo::quickExit(result); } diff --git a/src/mongo/client/embedded/libmongodbcapi_test.cpp b/src/mongo/client/embedded/libmongodbcapi_test.cpp index 574bec94be2..df780bbe265 100644 --- a/src/mongo/client/embedded/libmongodbcapi_test.cpp +++ b/src/mongo/client/embedded/libmongodbcapi_test.cpp @@ -521,66 +521,64 @@ TEST_F(MongodbCAPITest, InsertAndUpdate) { TEST_F(MongodbCAPITest, RunListCommands) { auto client = createClient(); - std::vector<std::string> whitelist = { - "_hashBSONElement", - "aggregate", - "buildInfo", - "cloneCollectionAsCapped", - "collMod", - "collStats", - "configureFailPoint", - "convertToCapped", - "count", - "create", - "createIndexes", - "currentOp", - "dataSize", - "dbStats", - "delete", - "distinct", - "drop", - "dropDatabase", - "dropIndexes", - "echo", - "explain", - "find", - "findAndModify", - "geoNear", - "getLastError", - "getMore", - "getParameter", - "getPrevError", - "getShardMap", - "insert", - "isMaster", - "killCursors", - "killOp", - "listCollections", - "listCommands", - "listDatabases", - "listIndexes", - "lockInfo", - "logApplicationMessage", // TODO: See whether we need this command - "ping", - "planCacheClear", - "planCacheClearFilters", - "planCacheListFilters", - "planCacheListPlans", - "planCacheListQueryShapes", - "planCacheSetFilter", - "reIndex", - "renameCollection", - "repairCursor", - "repairDatabase", - "replSetGetStatus", - "resetError", - "serverStatus", - "setBatteryLevel", - "setParameter", - "sleep", - "trimMemory", - "update", - "validate"}; + std::vector<std::string> whitelist = {"_hashBSONElement", + "aggregate", + "buildInfo", + "cloneCollectionAsCapped", + "collMod", + "collStats", + "configureFailPoint", + "convertToCapped", + "count", + "create", + "createIndexes", + "currentOp", + "dataSize", + "dbStats", + "delete", + "distinct", + "drop", + "dropDatabase", + "dropIndexes", + "echo", + "explain", + "find", + "findAndModify", + "geoNear", + "getLastError", + "getMore", + "getParameter", + "getPrevError", + "getShardMap", + "insert", + "isMaster", + "killCursors", + "killOp", + "listCollections", + "listCommands", + "listDatabases", + "listIndexes", + "lockInfo", + "ping", + "planCacheClear", + "planCacheClearFilters", + "planCacheListFilters", + "planCacheListPlans", + "planCacheListQueryShapes", + "planCacheSetFilter", + "reIndex", + "renameCollection", + "repairCursor", + "repairDatabase", + "replSetGetStatus", + "resetError", + "serverStatus", + "setBatteryLevel", + "setParameter", + "sleep", + "trimMemory", + "update", + "validate"}; std::sort(whitelist.begin(), whitelist.end()); mongo::BSONObj listCommandsObj = mongo::fromjson("{ listCommands: 1 }"); @@ -716,7 +714,8 @@ int main(const int argc, const char* const* const argv) { std::cerr << "Did not get a log callback." << std::endl; } - ::mongo::unittest::Suite::run(std::vector<std::string>(), "", 1); + const auto result = ::mongo::unittest::Suite::run(std::vector<std::string>(), "", 1); globalTempDir.reset(); + mongo::quickExit(result); } |