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 2017/12/16 03:56:32 UTC
maven-surefire git commit: [SUREFIRE-1451] Surefire Booter
compatibility with NetBSD ps(1) output
Repository: maven-surefire
Updated Branches:
refs/heads/SUREFIRE-1451 [created] d7592d670
[SUREFIRE-1451] Surefire Booter compatibility with NetBSD ps(1) output
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/d7592d67
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/d7592d67
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/d7592d67
Branch: refs/heads/SUREFIRE-1451
Commit: d7592d670f98b08d336a8a04bf1f2c55bbc7e858
Parents: 39acb98
Author: Tibor17 <ti...@apache.org>
Authored: Sat Dec 16 04:56:20 2017 +0100
Committer: Tibor17 <ti...@apache.org>
Committed: Sat Dec 16 04:56:20 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/maven/surefire/booter/PpidChecker.java | 3 ++-
.../org/apache/maven/surefire/booter/PpidCheckerTest.java | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d7592d67/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java
index c78fd43..e5d39eb 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java
@@ -54,8 +54,9 @@ final class PpidChecker
/**
* The etime is in the form of [[dd-]hh:]mm:ss on Unix like systems.
+ * See the workaround https://issues.apache.org/jira/browse/SUREFIRE-1451.
*/
- static final Pattern UNIX_CMD_OUT_PATTERN = compile( "^(((\\d+)-)?(\\d{2}):)?(\\d{2}):(\\d{2})$" );
+ static final Pattern UNIX_CMD_OUT_PATTERN = compile( "^(((\\d+)-)?(\\d{1,2}):)?(\\d{1,2}):(\\d{1,2})$" );
private final long pluginPid;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/d7592d67/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java
index 103f841..a58614d 100644
--- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java
+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java
@@ -144,5 +144,13 @@ public class PpidCheckerTest
assertThat( PpidChecker.fromHours( m ) ).isEqualTo( 3600L );
assertThat( PpidChecker.fromMinutes( m ) ).isEqualTo( 300L );
assertThat( PpidChecker.fromSeconds( m ) ).isEqualTo( 38L );
+
+ m = PpidChecker.UNIX_CMD_OUT_PATTERN.matcher( "02-1:5:3" );
+ assertThat( m.matches() )
+ .isTrue();
+ assertThat( PpidChecker.fromDays( m ) ).isEqualTo( 2 * 24 * 3600L );
+ assertThat( PpidChecker.fromHours( m ) ).isEqualTo( 3600L );
+ assertThat( PpidChecker.fromMinutes( m ) ).isEqualTo( 300L );
+ assertThat( PpidChecker.fromSeconds( m ) ).isEqualTo( 3L );
}
}