You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/12/25 18:45:40 UTC
[maven-surefire] branch cli updated: process should be closed at
the end
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch cli
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/cli by this push:
new 84027d9 process should be closed at the end
84027d9 is described below
commit 84027d993c1c42d9a65e5e322b62201da74f0e1a
Author: tibordigana <ti...@apache.org>
AuthorDate: Wed Dec 25 19:45:34 2019 +0100
process should be closed at the end
---
.../plugin/surefire/booterclient/ForkStarter.java | 51 +++++++++-------------
.../extensions/util/CommandlineExecutor.java | 2 +-
2 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index e644f2e..a17737b 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -550,7 +550,7 @@ public class ForkStarter
private RunResult fork( Object testSet, KeyValueSource providerProperties, ForkClient forkClient,
SurefireProperties effectiveSystemProperties, int forkNumber,
- AbstractForkInputStream testProvidingInputStream, boolean readTestsFromInStream )
+ AbstractForkInputStream commandInputStream, boolean readTestsFromInStream )
throws SurefireBooterForkException
{
final String tempDir;
@@ -589,9 +589,9 @@ public class ForkStarter
OutputStreamFlushableCommandline cli =
forkConfiguration.createCommandLine( startupConfiguration, forkNumber, dumpLogDir );
- if ( testProvidingInputStream != null )
+ if ( commandInputStream != null )
{
- testProvidingInputStream.setFlushReceiverProvider( cli );
+ commandInputStream.setFlushReceiverProvider( cli );
}
cli.createArg().setValue( tempDir );
@@ -602,9 +602,8 @@ public class ForkStarter
cli.createArg().setValue( systPropsFile.getName() );
}
- final ThreadedStreamConsumer threadedStreamConsumer = new ThreadedStreamConsumer( forkClient );
- final CloseableCloser closer = new CloseableCloser( forkNumber, threadedStreamConsumer,
- requireNonNull( testProvidingInputStream, "null param" ) );
+ ThreadedStreamConsumer eventConsumer = new ThreadedStreamConsumer( forkClient );
+ CloseableCloser closer = new CloseableCloser( forkNumber, eventConsumer, requireNonNull( commandInputStream ) );
log.debug( "Forking command line: " + cli );
@@ -614,25 +613,23 @@ public class ForkStarter
StreamFeeder in = null;
LineConsumerThread out = null;
LineConsumerThread err = null;
- try
+ DefaultReporterFactory reporter = forkClient.getDefaultReporterFactory();
+ currentForkClients.add( forkClient );
+ CountdownCloseable countdownCloseable = new CountdownCloseable( eventConsumer, 2 );
+ try ( CommandlineExecutor exec = new CommandlineExecutor( cli, countdownCloseable ) )
{
- NativeStdErrStreamConsumer stdErrConsumer =
- new NativeStdErrStreamConsumer( forkClient.getDefaultReporterFactory() );
- currentForkClients.add( forkClient );
-
// default impl of the extension - solves everything including the encoder/decoder, Process starter,
// adaptation of the streams to pipes and sockets
// non-default impl may use another classes and not the LineConsumerThread, StreamFeeder - freedom
// BEGIN: beginning of the call of the extension
- CountdownCloseable countdownCloseable = new CountdownCloseable( threadedStreamConsumer, 2 );
- CommandlineExecutor exec = new CommandlineExecutor( cli, countdownCloseable );
CommandlineStreams streams = exec.execute();
closer.addCloseable( streams );
- in = new StreamFeeder( "std-in-fork-" + forkNumber, streams.getStdInChannel(), testProvidingInputStream );
+ in = new StreamFeeder( "std-in-fork-" + forkNumber, streams.getStdInChannel(), commandInputStream );
in.start();
out = new LineConsumerThread( "std-out-fork-" + forkNumber, streams.getStdOutChannel(),
- threadedStreamConsumer, countdownCloseable );
+ eventConsumer, countdownCloseable );
out.start();
+ NativeStdErrStreamConsumer stdErrConsumer = new NativeStdErrStreamConsumer( reporter );
err = new LineConsumerThread( "std-err-fork-" + forkNumber, streams.getStdErrChannel(),
stdErrConsumer, countdownCloseable );
err.start();
@@ -641,7 +638,7 @@ public class ForkStarter
if ( forkClient.hadTimeout() )
{
- runResult = timeout( forkClient.getDefaultReporterFactory().getGlobalRunStatistics().getRunResult() );
+ runResult = timeout( reporter.getGlobalRunStatistics().getRunResult() );
}
else if ( result != SUCCESS )
{
@@ -658,7 +655,7 @@ public class ForkStarter
}
catch ( CommandLineException e )
{
- runResult = failure( forkClient.getDefaultReporterFactory().getGlobalRunStatistics().getRunResult(), e );
+ runResult = failure( reporter.getGlobalRunStatistics().getRunResult(), e );
String cliErr = e.getLocalizedMessage();
Throwable cause = e.getCause();
booterForkException =
@@ -667,26 +664,20 @@ public class ForkStarter
finally
{
currentForkClients.remove( forkClient );
- if ( forkClient.isSaidGoodBye() )
+ try
{
- closer.close();
+ Closeable c = forkClient.isSaidGoodBye() ? closer : commandInputStream;
+ c.close();
}
- else
+ catch ( IOException e )
{
- try
- {
- testProvidingInputStream.close();
- }
- catch ( IOException e )
- {
- InPluginProcessDumpSingleton.getSingleton()
- .dumpException( e, e.getLocalizedMessage(), dumpLogDir, forkNumber );
- }
+ InPluginProcessDumpSingleton.getSingleton()
+ .dumpException( e, e.getLocalizedMessage(), dumpLogDir, forkNumber );
}
if ( runResult == null )
{
- runResult = forkClient.getDefaultReporterFactory().getGlobalRunStatistics().getRunResult();
+ runResult = reporter.getGlobalRunStatistics().getRunResult();
}
forkClient.close( runResult.isTimeout() );
diff --git a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/CommandlineExecutor.java b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/CommandlineExecutor.java
index 8641287..14a055d 100644
--- a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/CommandlineExecutor.java
+++ b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/CommandlineExecutor.java
@@ -63,7 +63,7 @@ public class CommandlineExecutor implements Closeable
private final Commandline cli;
private final CountdownCloseable endOfStreamsCountdown;
private Process process;
- private volatile Thread shutdownHook;
+ private Thread shutdownHook;
public CommandlineExecutor( Commandline cli, CountdownCloseable endOfStreamsCountdown )
{