Fix failure in ScalingThreadPoolTests after addition of merge scheduler

Author: mark-vieira

muted-tests.yml

@@ -396,9 +396,6 @@ tests:
 - class: org.elasticsearch.xpack.ilm.DataStreamAndIndexLifecycleMixingTests
   method: testGetDataStreamResponse
   issue: https://github.com/elastic/elasticsearch/issues/125083
-- class: org.elasticsearch.threadpool.ScalingThreadPoolTests
-  method: testScalingThreadPoolConfiguration
-  issue: https://github.com/elastic/elasticsearch/issues/125142
 - class: org.elasticsearch.packaging.test.DockerTests
   method: test012SecurityCanBeDisabled
   issue: https://github.com/elastic/elasticsearch/issues/116636

server/src/test/java/org/elasticsearch/threadpool/ScalingThreadPoolTests.java

@@ -119,6 +119,7 @@ private int expectedSize(final String threadPoolName, final int numberOfProcesso
         sizes.put(ThreadPool.Names.SNAPSHOT_META, n -> Math.min(n * 3, 50));
         sizes.put(ThreadPool.Names.FETCH_SHARD_STARTED, ThreadPool::twiceAllocatedProcessors);
         sizes.put(ThreadPool.Names.FETCH_SHARD_STORE, ThreadPool::twiceAllocatedProcessors);
+        sizes.put(ThreadPool.Names.MERGE, Function.identity());
         return sizes.get(threadPoolName).apply(numberOfProcessors);
     }