Переглянути джерело

Fix JvmInfoTests#testUseG1GC to include OpenJDK VMs

Since OpenJDK virtual machines have G1 GC but do not have a java.vm.name
that contains HotSpot, this test fails on OpenJDK. Instead, the
java.vm.name condition should be expanded to include OpenJDK virtual
machines.
Jason Tedor 9 роки тому
батько
коміт
ed3a71fa2b

+ 1 - 1
core/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java

@@ -29,7 +29,7 @@ public class JvmInfoTests extends ESTestCase {
         // if we are running on HotSpot, and the test JVM was started
         // with UseG1GC, then JvmInfo should successfully report that
         // G1GC is enabled
-        if (Constants.JVM_NAME.contains("HotSpot")) {
+        if (Constants.JVM_NAME.contains("HotSpot") || Constants.JVM_NAME.contains("OpenJDK")) {
             assertEquals(Boolean.toString(isG1GCEnabled()), JvmInfo.jvmInfo().useG1GC());
         } else {
             assertEquals("unknown", JvmInfo.jvmInfo().useG1GC());