Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 3 insertions, 35 deletions

diff --git a/src/mongo/util/processinfo_test.cpp b/src/mongo/util/processinfo_test.cpp
index ab35a6b7374..050835f97ac 100644
--- a/src/mongo/util/processinfo_test.cpp
+++ b/src/mongo/util/processinfo_test.cpp
@@ -33,30 +33,13 @@
 #include <iostream>
 #include <vector>
 
-#include "mongo/bson/bsonobj.h"
-#include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/processinfo.h"
 
 using boost::optional;
+using mongo::ProcessInfo;
 
-namespace mongo {
-
-namespace {
-using StringMap = std::map<std::string, uint64_t>;
-
-StringMap toStringMap(BSONObj& obj) {
-    StringMap map;
-
-    for (const auto& e : obj) {
-        map[e.fieldName()] = e.numberLong();
-    }
-
-    return map;
-}
-
-#define ASSERT_KEY(_key) ASSERT_TRUE(stringMap.find(_key) != stringMap.end());
-
+namespace mongo_test {
 TEST(ProcessInfo, SysInfoIsInitialized) {
     ProcessInfo processInfo;
     if (processInfo.supported()) {
@@ -64,20 +47,6 @@ TEST(ProcessInfo, SysInfoIsInitialized) {
     }
 }
 
-TEST(FTDCProcSysInfo, TestSysInfo) {
-    auto sysInfo = ProcessInfo();
-    BSONObjBuilder builder;
-    sysInfo.appendSystemDetails(builder);
-
-    BSONObj obj = builder.obj();
-    auto stringMap = toStringMap(obj);
-    ASSERT_KEY("extra");
-
-    BSONObj extra = obj.getObjectField("extra");
-    stringMap = toStringMap(extra);
-    ASSERT_KEY("cpuString");
-}
-
 TEST(ProcessInfo, GetNumAvailableCores) {
 #if defined(__APPLE__) || defined(__linux__) || (defined(__sun) && defined(__SVR4)) || \
     defined(_WIN32)
@@ -90,5 +59,4 @@ TEST(ProcessInfo, GetNumAvailableCores) {
 TEST(ProcessInfo, GetNumCoresReturnsNonZeroNumberOfProcessors) {
     ASSERT_GREATER_THAN(ProcessInfo::getNumCores(), 0u);
 }
-}  // namespace
-}  // namespace mongo
+}  // namespace mongo_test