Fix gradle tests on Windows

jakelandis · jakelandis · commit e87f810c7603 · 2017-07-17T22:49:05.000Z
Addresses #7637 Fixes #7716
diff --git a/ci/ci_test.bat b/ci/ci_test.bat
@@ -1,4 +1,3 @@
-goto no_test
 @echo off
 
 setlocal
@@ -40,5 +39,3 @@ IF "%SELECTEDTESTSUITE%"=="core-fail-fast" (
     %RAKEPATH% test:core
   )
 )
-:no_test
-echo ***** SKIPPING TESTS : https://github.com/elastic/logstash/issues/7634 *****
diff --git a/logstash-core/src/test/java/org/logstash/instruments/monitors/HotThreadMonitorTest.java b/logstash-core/src/test/java/org/logstash/instruments/monitors/HotThreadMonitorTest.java
@@ -50,7 +50,8 @@ public void testStackTraceSizeOption(){
         Map<String, String> options = new HashMap<>();
         options.put("stacktrace_size", testStackSize);
         HotThreadsMonitor.detect(options).stream().filter(tr -> !tr.getThreadName().equals("Signal Dispatcher") &&
-                                                                      !tr.getThreadName().equals("Reference Handler"))
+                                                                      !tr.getThreadName().equals("Reference Handler") &&
+                                                                            !tr.getThreadName().equals("Attach Listener"))
                                                         .forEach(tr -> {
             List stackTrace = (List)tr.toMap().get("thread.stacktrace");
             assertThat(stackTrace.size(), is(Integer.valueOf(testStackSize)));
diff --git a/logstash-core/src/test/java/org/logstash/instruments/monitors/ProcessMonitorTest.java b/logstash-core/src/test/java/org/logstash/instruments/monitors/ProcessMonitorTest.java
@@ -8,20 +8,23 @@
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assume.assumeTrue;
 
 public class ProcessMonitorTest {
 
 
     @Test
     public void testReportFDStats(){
         Map<String, Object> processStats = ProcessMonitor.detect().toMap();
+        assumeTrue((Boolean) processStats.get("is_unix"));
         assertThat("open_file_descriptors", (Long)processStats.get("open_file_descriptors") > 0L, is(true));
         assertThat("max_file_descriptors", (Long)processStats.get("max_file_descriptors") > 0L, is(true));
     }
 
     @Test
     public void testReportCpuStats(){
         Map<String, Object> processStats = ProcessMonitor.detect().toMap();
+        assumeTrue((Boolean) processStats.get("is_unix"));
         assertThat("cpu", processStats.get("cpu"), instanceOf(Map.class));
         Map cpuStats = ((Map)processStats.get("cpu"));
         assertThat("cpu.process_percent", (Short)cpuStats.get("process_percent") >= 0, is(true));
@@ -32,6 +35,7 @@ public void testReportCpuStats(){
     @Test
     public void testReportMemStats() {
         Map<String, Object> processStats = ProcessMonitor.detect().toMap();
+        assumeTrue((Boolean) processStats.get("is_unix"));
         assertThat("mem", processStats.get("mem"), instanceOf(Map.class));
         Map memStats = ((Map)processStats.get("mem"));
         assertThat("mem.total_virtual_in_bytes", (Long)memStats.get("total_virtual_in_bytes") >= 0L, is(true));
diff --git a/logstash-core/src/test/java/org/logstash/instruments/monitors/SystemMonitorTest.java b/logstash-core/src/test/java/org/logstash/instruments/monitors/SystemMonitorTest.java
@@ -14,10 +14,12 @@ public class SystemMonitorTest {
     @Test
     public void systemMonitorTest(){
         Map<String, Object> map = SystemMonitor.detect().toMap();
-        assertThat("system.load_average is missing", (Double)map.get("system.load_average") > 0, is(true));
+        assertThat("os.name is missing", map.get("os.name"), allOf(notNullValue(), instanceOf(String.class)));
+        if (!((String) map.get("os.name")).startsWith("Windows")) {
+            assertThat("system.load_average is missing", (Double) map.get("system.load_average") > 0, is(true));
+        }
         assertThat("system.available_processors is missing ", ((Integer)map.get("system.available_processors")) > 0, is(true));
         assertThat("os.version is missing", map.get("os.version"), allOf(notNullValue(), instanceOf(String.class)));
         assertThat("os.arch is missing", map.get("os.arch"), allOf(notNullValue(), instanceOf(String.class)));
-        assertThat("os.name is missing", map.get("os.name"), allOf(notNullValue(), instanceOf(String.class)));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-goto no_test`
`2`	`1`	`@echo off`
`3`	`2`
`4`	`3`	`setlocal`
`@@ -40,5 +39,3 @@ IF "%SELECTEDTESTSUITE%"=="core-fail-fast" (`
`40`	`39`	`%RAKEPATH% test:core`
`41`	`40`	`)`
`42`	`41`	`)`
`43`		`-:no_test`
`44`		`-echo *** SKIPPING TESTS : https://github.com/elastic/logstash/issues/7634 ***`