From 3a6371e5e0f8999ff1fa01c6cf067ed5036b22ab Mon Sep 17 00:00:00 2001
From: Chris Vest <mr.chrisvest@gmail.com>
Date: Tue, 16 May 2017 11:25:28 +0200
Subject: [PATCH] Fix MetricsKernelExtensionFactoryIT test flakiness and test
 bugs

---
 .../neo4j/metrics/MetricsKernelExtensionFactoryIT.java    | 3 +--
 .../test/java/org/neo4j/metrics/MetricsTestHelper.java    | 8 +++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/enterprise/metrics/src/test/java/org/neo4j/metrics/MetricsKernelExtensionFactoryIT.java b/enterprise/metrics/src/test/java/org/neo4j/metrics/MetricsKernelExtensionFactoryIT.java
index aa4b2882ef4a1..395b30b8a56e3 100644
--- a/enterprise/metrics/src/test/java/org/neo4j/metrics/MetricsKernelExtensionFactoryIT.java
+++ b/enterprise/metrics/src/test/java/org/neo4j/metrics/MetricsKernelExtensionFactoryIT.java
@@ -19,7 +19,6 @@
  */
 package org.neo4j.metrics;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -200,7 +199,7 @@ public void shouldUseEventBasedReportingCorrectly() throws Throwable
         // wait for the file to be written before shutting down the cluster
         File metricFile = metricsCsv( outputPath, CheckPointingMetrics.CHECK_POINT_DURATION );
 
-        long result = readLongValueAndAssert( metricFile, ( newValue, currentValue ) -> newValue > 0 );
+        long result = readLongValueAndAssert( metricFile, ( newValue, currentValue ) -> newValue >= 0 );
 
         // THEN
         assertThat( result, greaterThanOrEqualTo( 0L ) );
diff --git a/enterprise/metrics/src/test/java/org/neo4j/metrics/MetricsTestHelper.java b/enterprise/metrics/src/test/java/org/neo4j/metrics/MetricsTestHelper.java
index cbc40e79466fc..cabcac78e9e5d 100644
--- a/enterprise/metrics/src/test/java/org/neo4j/metrics/MetricsTestHelper.java
+++ b/enterprise/metrics/src/test/java/org/neo4j/metrics/MetricsTestHelper.java
@@ -53,7 +53,13 @@ public static long readLongValueAndAssert( File metricFile, BiPredicate<Integer,
 
         try ( BufferedReader reader = new BufferedReader( new FileReader( metricFile ) ) )
         {
-            String[] headers = reader.readLine().split( "," );
+            String s;
+            do
+            {
+                s = reader.readLine();
+            }
+            while ( s == null );
+            String[] headers = s.split( "," );
             assertThat( headers.length, is( 2 ) );
             assertThat( headers[TIME_STAMP], is( "t" ) );
             assertThat( headers[METRICS_VALUE], is( "value" ) );