[maven-surefire] branch SUREFIRE-1689 updated: fixed test

[tibordigana]

This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch SUREFIRE-1689
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


The following commit(s) were added to refs/heads/SUREFIRE-1689 by this push:
     new c9ae0a5  fixed test
c9ae0a5 is described below

commit c9ae0a501cd1a5517f1654ab8f31ae1d8799a612
Author: tibordigana <tibordig...@apache.org>
AuthorDate: Mon Oct 14 22:39:13 2019 +0200

    fixed test
---
 .../main/java/org/apache/maven/surefire/booter/PpidChecker.java    | 6 +++---
 .../main/java/org/apache/maven/surefire/booter/ProcessInfo.java    | 4 ++--
 .../java/org/apache/maven/surefire/booter/PpidCheckerTest.java     | 7 ++++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

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 2654c7f..c700579 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
@@ -125,7 +125,7 @@ final class PpidChecker
             parentProcessInfo = unix();
             checkProcessInfo();
 
-            System.out.println( "isInvalid=" + parentProcessInfo.isInvalid() + 
", previousInfo=" + previousInfo );
+            // System.out.println( "isInvalid=" + 
parentProcessInfo.isInvalid() + ", previousInfo=" + previousInfo );
             // let's compare elapsed time, should be greater or equal if 
parent process is the same and still alive
             return !parentProcessInfo.isInvalid()
                     && ( previousInfo == null || 
!parentProcessInfo.isTimeBefore( previousInfo ) );
@@ -366,12 +366,12 @@ final class PpidChecker
                 while ( scanner.hasNextLine() )
                 {
                     String line = scanner.nextLine().trim();
-                    System.out.println( "java version " + System.getProperty( 
"java.version" ) + " line=" + line );
+                    // System.out.println( "java version " + 
System.getProperty( "java.version" ) + " line=" + line );
                     processInfo = consumeLine( line, processInfo );
                 }
                 checkValid( scanner );
                 int exitCode = process.waitFor();
-                System.out.println( "isStopped=" + isStopped() + ", exitCode=" 
+ exitCode );
+                // System.out.println( "isStopped=" + isStopped() + ", 
exitCode=" + exitCode );
                 return isStopped() ? ERR_PROCESS_INFO : exitCode == 0 ? 
processInfo : INVALID_PROCESS_INFO;
             }
             catch ( Exception e )
diff --git 
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessInfo.java
 
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessInfo.java
index fe754f1..77d7e8d 100644
--- 
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessInfo.java
+++ 
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessInfo.java
@@ -93,7 +93,7 @@ final class ProcessInfo
     {
         checkValid();
         that.checkValid();
-        return this.time.compareTo( that.time ) == 0;
+        return time.compareTo( that.time ) == 0;
     }
 
     @SuppressWarnings( "unchecked" )
@@ -101,7 +101,7 @@ final class ProcessInfo
     {
         checkValid();
         that.checkValid();
-        return this.time.compareTo( that.time ) < 0;
+        return time.compareTo( that.time ) < 0;
     }
 
     private void checkValid()
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 10db710..ccccd61 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
@@ -27,6 +27,7 @@ import java.io.File;
 import java.lang.management.ManagementFactory;
 import java.util.regex.Matcher;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.apache.commons.lang3.SystemUtils.IS_OS_UNIX;
 import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS;
 import static org.apache.maven.surefire.booter.ProcessInfo.unixProcessInfo;
@@ -94,8 +95,12 @@ public class PpidCheckerTest
         PpidChecker checker = new PpidChecker( expectedPid );
         setInternalState( checker, "parentProcessInfo",
                 IS_OS_UNIX
-                        ? unixProcessInfo( expectedPid, 
System.currentTimeMillis() - 1_000L )
+                        ? unixProcessInfo( expectedPid, 0L )
                         : windowsProcessInfo( expectedPid, 
windowsProcessStartTime( checker ) ) );
+
+        // the etime in Unix is measured in seconds. So let's wait 1s at least.
+        SECONDS.sleep( 1L );
+
         ProcessInfo processInfo = IS_OS_UNIX ? checker.unix() : 
checker.windows();
 
         assertThat( processInfo )