New upstream version 6.0.20upstream

1 files changed, 35 insertions, 3 deletions

diff --git a/src/mongo/util/processinfo_test.cpp b/src/mongo/util/processinfo_test.cpp
index 050835f97ac..ab35a6b7374 100644
--- a/src/mongo/util/processinfo_test.cpp
+++ b/src/mongo/util/processinfo_test.cpp
@@ -33,13 +33,30 @@
 #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_test {
+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());
+
 TEST(ProcessInfo, SysInfoIsInitialized) {
     ProcessInfo processInfo;
     if (processInfo.supported()) {
@@ -47,6 +64,20 @@ 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)
@@ -59,4 +90,5 @@ TEST(ProcessInfo, GetNumAvailableCores) {
 TEST(ProcessInfo, GetNumCoresReturnsNonZeroNumberOfProcessors) {
     ASSERT_GREATER_THAN(ProcessInfo::getNumCores(), 0u);
 }
-}  // namespace mongo_test
+}  // namespace
+}  // namespace mongo