Backport of [CI] JvmStatsTests testJvmStats failing (115711) (#116252)

alexey-ivanov-es · web-flow · commit 4764c35449ae · 2024-11-05T15:22:40.000Z
Fix and unmute test JvmStatsTests.testJvmStats
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -270,9 +270,6 @@ tests:
 - class: org.elasticsearch.reservedstate.service.FileSettingsServiceTests
   method: testProcessFileChanges
   issue: https://github.com/elastic/elasticsearch/issues/115280
-- class: org.elasticsearch.monitor.jvm.JvmStatsTests
-  method: testJvmStats
-  issue: https://github.com/elastic/elasticsearch/issues/115711
 - class: org.elasticsearch.xpack.inference.DefaultEndPointsIT
   method: testInferDeploysDefaultE5
   issue: https://github.com/elastic/elasticsearch/issues/115361
diff --git a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmStatsTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmStatsTests.java
@@ -53,7 +53,7 @@ public void testJvmStats() {
         assertThat(memoryPools, hasKey("Metaspace"));
         assertThat(memoryPools.keySet(), hasSize(greaterThan(3)));
         for (JvmStats.MemoryPool memoryPool : memoryPools.values()) {
-            assertThat(memoryPool.getUsed().getBytes(), greaterThan(0L));
+            assertThat("Memory pool: " + memoryPool.getName(), memoryPool.getUsed().getBytes(), greaterThanOrEqualTo(0L));
         }
 
         // Threads

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void testJvmStats() {`
`53`	`53`	`assertThat(memoryPools, hasKey("Metaspace"));`
`54`	`54`	`assertThat(memoryPools.keySet(), hasSize(greaterThan(3)));`
`55`	`55`	`for (JvmStats.MemoryPool memoryPool : memoryPools.values()) {`
`56`		`- assertThat(memoryPool.getUsed().getBytes(), greaterThan(0L));`
	`56`	`+ assertThat("Memory pool: " + memoryPool.getName(), memoryPool.getUsed().getBytes(), greaterThanOrEqualTo(0L));`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// Threads`