[SUREFIRE-1516] Poor performance in reuseForks=false

apache · Dec 29, 2019 · 5148b02 · 5148b02
1 parent 2e65fb2
commit 5148b02
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
@@ -412,6 +412,12 @@ public void run()
                                 CommandReader.this.wakeupIterator();
                                 callListeners( command );
                                 break;
+                            case BYE_ACK:
+                                callListeners( command );
+                                // After SHUTDOWN no more commands can come.
+                                // Hence, do NOT go back to blocking in I/O.
+                                CommandReader.this.state.set( TERMINATED );
+                                break;
                             default:
                                 callListeners( command );
                                 break;

diff --git a/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/BaseForkTimeout.java b/surefire-its/src/test/resources/fork-timeout/src/test/java/forktimeout/BaseForkTimeout.java
@@ -23,7 +23,7 @@ public abstract class BaseForkTimeout
 {
     protected void dumpStuff( String prefix )
     {
-        reallySleep( 990 );
+        reallySleep( 1350L );
         for ( int i = 0; i < 200; i++ )
         {
             System.out.println( prefix + " with lots of output " + i );