1 files changed, 23 insertions, 28 deletions

diff --git a/src/mongo/util/latch_analyzer_test.cpp b/src/mongo/util/latch_analyzer_test.cpp
index b8b519b6c90..993cf14fbe8 100644
--- a/src/mongo/util/latch_analyzer_test.cpp
+++ b/src/mongo/util/latch_analyzer_test.cpp
@@ -27,6 +27,7 @@
  *    it in the license file.
  */
 
+#include "mongo/db/commands/test_commands_enabled.h"
 #include "mongo/db/service_context_test_fixture.h"
 #include "mongo/platform/mutex.h"
 #include "mongo/platform/source_location.h"
@@ -40,44 +41,44 @@ namespace {
 
 using Level = HierarchicalAcquisitionLevel;
 
-class LatchAnalyzerTest : public ServiceContextTest {};
+class LatchAnalyzerTest : public ServiceContextTest {
+    void setUp() override {
+        ServiceContextTest::setUp();
+        setTestCommandsEnabled(true);
+    }
+
+    void tearDown() override {
+        setTestCommandsEnabled(false);
+        ServiceContextTest::tearDown();
+    }
+};
 
 DEATH_TEST_F(LatchAnalyzerTest, AddInvalidWasAbsent, "Fatal assertion 31360") {
 
-    Mutex lowerLevel = MONGO_MAKE_LATCH(
-        Level(1), (SourceLocationHolder)MONGO_SOURCE_LOCATION(), "AddInvalidWasAbsent::lowerLevel");
-    Mutex higherLevel = MONGO_MAKE_LATCH(Level(2),
-                                         (SourceLocationHolder)MONGO_SOURCE_LOCATION(),
-                                         "AddInvalidWasAbsent::higherLevel");
+    Mutex lowerLevel = MONGO_MAKE_LATCH(Level(1), "AddInvalidWasAbsent::lowerLevel");
+    Mutex higherLevel = MONGO_MAKE_LATCH(Level(2), "AddInvalidWasAbsent::higherLevel");
 
     lowerLevel.lock();
     higherLevel.lock();
 }
 
 DEATH_TEST_F(LatchAnalyzerTest, AddInvalidWasPresent, "Fatal assertion 31360") {
-    Mutex m1 = MONGO_MAKE_LATCH(
-        Level(1), (SourceLocationHolder)MONGO_SOURCE_LOCATION(), "AddInvalidWasPresent::m1");
-    Mutex m2 = MONGO_MAKE_LATCH(
-        Level(1), (SourceLocationHolder)MONGO_SOURCE_LOCATION(), "AddInvalidWasPresent::m2");
+    Mutex m1 = MONGO_MAKE_LATCH(Level(1), "AddInvalidWasPresent::m1");
+    Mutex m2 = MONGO_MAKE_LATCH(Level(1), "AddInvalidWasPresent::m2");
 
     m1.lock();
     m2.lock();
 }
 
 DEATH_TEST_F(LatchAnalyzerTest, RemoveInvalidWasAbsent, "Fatal assertion 31361") {
-    Mutex m = MONGO_MAKE_LATCH(
-        Level(1), (SourceLocationHolder)MONGO_SOURCE_LOCATION(), "RemoveInvalidWasAbsent::m");
+    Mutex m = MONGO_MAKE_LATCH(Level(1), "RemoveInvalidWasAbsent::m");
 
     m.unlock();
 }
 
 DEATH_TEST_F(LatchAnalyzerTest, RemoveInvalidWasPresent, "Fatal assertion 31361") {
-    Mutex higherLevel = MONGO_MAKE_LATCH(Level(2),
-                                         (SourceLocationHolder)MONGO_SOURCE_LOCATION(),
-                                         "RemoveInvalidWasPresent::higherLevel");
-    Mutex lowerLevel = MONGO_MAKE_LATCH(Level(1),
-                                        (SourceLocationHolder)MONGO_SOURCE_LOCATION(),
-                                        "RemoveInvalidWasPresent::lowerLevel");
+    Mutex higherLevel = MONGO_MAKE_LATCH(Level(2), "RemoveInvalidWasPresent::higherLevel");
+    Mutex lowerLevel = MONGO_MAKE_LATCH(Level(1), "RemoveInvalidWasPresent::lowerLevel");
 
     higherLevel.lock();
     lowerLevel.lock();
@@ -85,10 +86,8 @@ DEATH_TEST_F(LatchAnalyzerTest, RemoveInvalidWasPresent, "Fatal assertion 31361"
 }
 
 TEST_F(LatchAnalyzerTest, AddValidWasAbsent) {
-    Mutex higherLevel = MONGO_MAKE_LATCH(
-        Level(2), (SourceLocationHolder)MONGO_SOURCE_LOCATION(), "AddValidWasAbsent::higherLevel");
-    Mutex lowerLevel = MONGO_MAKE_LATCH(
-        Level(1), (SourceLocationHolder)MONGO_SOURCE_LOCATION(), "AddValidWasAbsent::lowerLevel");
+    Mutex higherLevel = MONGO_MAKE_LATCH(Level(2), "AddValidWasAbsent::higherLevel");
+    Mutex lowerLevel = MONGO_MAKE_LATCH(Level(1), "AddValidWasAbsent::lowerLevel");
 
     higherLevel.lock();
     lowerLevel.lock();
@@ -102,12 +101,8 @@ TEST_F(LatchAnalyzerTest, AddValidWasAbsent) {
 
 TEST_F(LatchAnalyzerTest, RemoveValidWasPresent) {
 
-    Mutex higherLevel = MONGO_MAKE_LATCH(Level(2),
-                                         (SourceLocationHolder)MONGO_SOURCE_LOCATION(),
-                                         "RemoveValidWasPresent::higherLevel");
-    Mutex lowerLevel = MONGO_MAKE_LATCH(Level(1),
-                                        (SourceLocationHolder)MONGO_SOURCE_LOCATION(),
-                                        "RemoveValidWasPresent::lowerLevel");
+    Mutex higherLevel = MONGO_MAKE_LATCH(Level(2), "RemoveValidWasPresent::higherLevel");
+    Mutex lowerLevel = MONGO_MAKE_LATCH(Level(1), "RemoveValidWasPresent::lowerLevel");
 
     {
         LatchAnalyzerDisabledBlock block;