geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jensde...@apache.org
Subject [09/50] [abbrv] incubator-geode git commit: GEODE-291: Prevent stderr noise from com.gemstone.gemfire.test.process
Date Mon, 21 Dec 2015 18:04:37 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe295940/gemfire-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
b/gemfire-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
index 2847b34..67904bc 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
@@ -47,8 +47,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 public class ProcessWrapper {
   private static final Logger logger = LogService.getLogger();
 
-  protected static final String TIMEOUT_MILLIS_PROPERTY = "process.test.timeoutMillis";
-  protected static final long TIMEOUT_MILLIS_DEFAULT = 5 * 60 * 1000;
+  private static final long PROCESS_TIMEOUT_MILLIS = 10 * 60 * 1000L; // 10 minutes
   private static final long DELAY = 10;
 
   private final boolean headless;
@@ -323,11 +322,12 @@ public class ProcessWrapper {
   
         this.stdout = stdOut;
         this.stderr = stdErr;
-        this.outputReader = new ProcessOutputReader(this.process, stdOut, stdErr, this.allLines);
+        this.outputReader = new ProcessOutputReader(this.process, stdOut, stdErr);
         this.started = true;
       }
       
-      this.outputReader.waitFor();
+      this.outputReader.start();
+      this.outputReader.waitFor(PROCESS_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
       int code = this.process.waitFor();
       
       synchronized (this.exitValue) {
@@ -424,7 +424,7 @@ public class ProcessWrapper {
     private String[] mainArguments = null;
     private boolean useMainLauncher = true;
     private boolean headless = true;
-    private long timeoutMillis = TIMEOUT_MILLIS_DEFAULT;
+    private long timeoutMillis = PROCESS_TIMEOUT_MILLIS;
     private boolean inline = false;
     public Builder() {
       //nothing

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe295940/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
index d02110c..8ea38c3 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -21,9 +21,11 @@ activation.version = 1.1.1
 annotations.version = 3.0.0
 antlr.version = 2.7.7
 asm.version = 5.0.3
-assertj-core.version = 2.1.0
+assertj-core.version = 3.2.0
 awaitility.version = 1.6.5
 bcel.version = 5.2
+catch-exception.version = 1.4.4
+catch-throwable.version = 1.4.4
 cglib.version = 3.1
 classmate.version = 0.9.0
 commons-collections.version = 3.2.1


Mime
View raw message