Less flaky ProfilerTest.

neo4j · Nov 29, 2018 · ab72c91 · ab72c91
1 parent 48a3830
commit ab72c91
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/community/common/src/test/java/org/neo4j/resources/ProfilerTest.java b/community/common/src/test/java/org/neo4j/resources/ProfilerTest.java
@@ -31,11 +31,13 @@
 
 class ProfilerTest
 {
+    private static final int COMPUTE_WORK_MILLIS = 1000;
+
     @Test
     void profilerMustNoticeWhereTimeGoes() throws Exception
     {
         Profiler profiler = Profiler.profiler();
-        try ( Profiler.ProfiledInterval interval = profiler.profile() )
+        try ( Profiler.ProfiledInterval ignored = profiler.profile() )
         {
             expensiveComputation();
         }
@@ -47,7 +49,7 @@ void profilerMustNoticeWhereTimeGoes() throws Exception
     void profilerMustLimitItselfToProfiledRegion() throws Exception
     {
         Profiler profiler = Profiler.profiler();
-        try ( Profiler.ProfiledInterval interval = profiler.profile() )
+        try ( Profiler.ProfiledInterval ignored = profiler.profile() )
         {
             expensiveComputation();
         }
@@ -60,8 +62,8 @@ void profilerMustLimitItselfToProfiledRegion() throws Exception
     void profilerMustWaitUntilAfterAnInitialDelay() throws Exception
     {
         Profiler profiler = Profiler.profiler();
-        long initialDelayNanos = TimeUnit.MILLISECONDS.toNanos( 250 );
+        long initialDelayNanos = TimeUnit.MILLISECONDS.toNanos( COMPUTE_WORK_MILLIS * 3 );
-        try ( Profiler.ProfiledInterval interval = profiler.profile( Thread.currentThread(), initialDelayNanos ) )
+        try ( Profiler.ProfiledInterval ignored = profiler.profile( Thread.currentThread(), initialDelayNanos ) )
         {
             expensiveComputation();
         }
@@ -73,22 +75,22 @@ void profilerMustWaitUntilAfterAnInitialDelay() throws Exception
     private String getProfilerOutput( Profiler profiler ) throws InterruptedException
     {
         profiler.finish();
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        try ( PrintStream out = new PrintStream( baos ) )
+        try ( PrintStream out = new PrintStream( buffer ) )
         {
             profiler.printProfile( out, "Profile" );
             out.flush();
         }
-        return baos.toString();
+        return buffer.toString();
     }
 
     private void expensiveComputation() throws InterruptedException
     {
-        Thread.sleep( 50 );
+        Thread.sleep( COMPUTE_WORK_MILLIS );
     }
 
     private void otherIntenseWork() throws InterruptedException
     {
-        Thread.sleep( 50 );
+        Thread.sleep( COMPUTE_WORK_MILLIS );
     }
 }