SERVER-34653 MONGO_REGISTER_TEST_COMMAND

2 files changed, 2 insertions, 13 deletions

diff --git a/src/mongo/s/commands/cluster_multicast.cpp b/src/mongo/s/commands/cluster_multicast.cpp
index 54991980075..d1fcd3cc729 100644
--- a/src/mongo/s/commands/cluster_multicast.cpp
+++ b/src/mongo/s/commands/cluster_multicast.cpp
@@ -147,12 +147,7 @@ public:
     }
 };
 
-MONGO_INITIALIZER(RegisterMulticast)(InitializerContext* context) {
-    if (getTestCommandsEnabled()) {
-        new MulticastCmd();
-    }
-    return Status::OK();
-}
+MONGO_REGISTER_TEST_COMMAND(MulticastCmd);
 
 }  // namespace
 }  // namespace mongo
diff --git a/src/mongo/s/commands/cluster_restart_catalog_command.cpp b/src/mongo/s/commands/cluster_restart_catalog_command.cpp
index b91259a8de6..814846afdbc 100644
--- a/src/mongo/s/commands/cluster_restart_catalog_command.cpp
+++ b/src/mongo/s/commands/cluster_restart_catalog_command.cpp
@@ -89,13 +89,7 @@ public:
     }
 };
 
-MONGO_INITIALIZER(RegisterClusterRestartCatalogCommand)(InitializerContext* ctx) {
-    if (getTestCommandsEnabled()) {
-        // Leaked intentionally: a Command registers itself when constructed.
-        new ClusterRestartCatalogCmd();
-    }
-    return Status::OK();
-}
+MONGO_REGISTER_TEST_COMMAND(ClusterRestartCatalogCmd);
 
 }  // namespace
 }  // namespace mongo