fixup: another iteration

Author: addaleax

packages/service-provider-node-driver/src/node-driver-provider.integration.spec.ts

@@ -192,6 +192,19 @@ describe('NodeDriverServiceProvider [integration]', function () {
   });
 
   describe('#aggregate', function () {
+    let unsubscribeAllowWarnings: (() => void)[] = [];
+
+    before(function () {
+      // Allow "$function is deprecated" warning in logs
+      unsubscribeAllowWarnings = [
+        testServer.allowWarning?.(8996503) ?? [],
+      ].flat();
+    });
+
+    after(function () {
+      for (const cb of unsubscribeAllowWarnings) cb();
+    });
+
     context(
       'when passing a $function to be serialized by the driver',
       function () {

packages/shell-api/src/replica-set.spec.ts

@@ -1029,7 +1029,7 @@ describe('ReplicaSet', function () {
       });
 
       describe('remove member', function () {
-        let unsubscribeAllowWarnings: (() => void)[];
+        let unsubscribeAllowWarnings: (() => void)[] = [];
 
         before(function () {
           // Allow "Unable to forward progress" warnings
@@ -1079,7 +1079,7 @@ describe('ReplicaSet', function () {
     });
     describe('configureQueryAnalyzer()', function () {
       skipIfServerVersion(srv0, '< 7.0'); // analyzeShardKey will only be added in 7.0 which is not included in stable yet
-      let unsubscribeAllowWarnings: (() => void)[];
+      let unsubscribeAllowWarnings: (() => void)[] = [];
 
       before(function () {
         // Allow "Attempted to disable query sampling but query sampling was not active" warnings
@@ -1135,7 +1135,7 @@ describe('ReplicaSet', function () {
     );
 
     let serviceProvider: NodeDriverServiceProvider;
-    let unsubscribeAllowWarnings: (() => void)[];
+    let unsubscribeAllowWarnings: (() => void)[] = [];
 
     before(function () {
       // Allow "replSetReconfig" errors

packages/shell-api/src/shard.spec.ts

@@ -3035,7 +3035,7 @@ describe('Shard', function () {
     });
     describe('configureQueryAnalyzer()', function () {
       skipIfServerVersion(mongos, '< 7.0'); // analyzeShardKey will only be added in 7.0 which is not included in stable yet
-      let unsubscribeAllowWarnings: (() => void)[];
+      let unsubscribeAllowWarnings: (() => void)[] = [];
 
       before(function () {
         unsubscribeAllowWarnings = [mongos, rs0, rs1].flatMap((s) => [

testing/integration-testing-hooks.ts

@@ -235,9 +235,10 @@ export class MongoRunnerSetup extends MongodSetup {
     5123300, // "vm.max_map_count is too low"
     551190, // "Server certificate has no compatible Subject Alternative Name",
     20526, // "Failed to gather storage statistics for slow operation"
+    22668, // "Unable to ping distributed locks"
     (l: LogEntry) => {
       // "Use of deprecated server parameter name" (FTDC)
-     return l.id === 636300 && l.component === 'ftdc'
+     return (l.id === 636300 || l.id === 23803) && l.context === 'ftdc'
     },
     (l: LogEntry) => l.component === 'STORAGE', // Outside of mongosh's control
     (l: LogEntry) => l.context === 'BackgroundSync', // Outside of mongosh's control