Redirect errors

Author: Dig-Doug

test/integration/IntegrationTest.java

@@ -120,25 +120,26 @@ private WebElement getElement(By by) {
   private static Process startWebServer(Runfiles runfiles, int serverPort) throws Exception {
     String path =
         runfiles.rlocation("rules_typescript_proto/test/integration/client/prodserver.sh");
-    ProcessBuilder pb = new ProcessBuilder(path, "--port", Integer.toString(serverPort));
+    ProcessBuilder pb =
+        new ProcessBuilder(path, "--port", Integer.toString(serverPort)).redirectErrorStream(true);
     pb.environment().putAll(runfiles.getEnvVars());
     Process p = pb.start();
-    waitForReadyMessage(p, "listening on", false);
+    waitForReadyMessage(p, "listening on");
     return p;
   }
 
   private static Process startEnvoyProxy(Runfiles runfiles) throws Exception {
     String path = runfiles.rlocation("rules_typescript_proto/test/integration/envoy.yaml");
-    ProcessBuilder pb = new ProcessBuilder("envoy", "--config-path", path);
+    ProcessBuilder pb =
+        new ProcessBuilder("envoy", "--config-path", path).redirectErrorStream(true);
     pb.environment().putAll(runfiles.getEnvVars());
     Process p = pb.start();
-    waitForReadyMessage(p, "starting main dispatch loop", true);
+    waitForReadyMessage(p, "starting main dispatch loop");
     return p;
   }
 
-  private static void waitForReadyMessage(Process p, String readyMessage, boolean readErrorStream)
-      throws Exception {
-    InputStream is = readErrorStream ? p.getErrorStream() : p.getInputStream();
+  private static void waitForReadyMessage(Process p, String readyMessage) throws Exception {
+    InputStream is = p.getInputStream();
     InputStreamReader isr = new InputStreamReader(is);
     BufferedReader br = new BufferedReader(isr);
     String line;