[jboss-cvs] JBossAS SVN: r62031 - branches/Branch_4_2/testsuite/src/main/org/jboss/test/util/test.

[jboss-cvs-commits at lists.jboss.org]

Author: stan.silvert at jboss.com
Date: 2007-04-03 09:39:59 -0400 (Tue, 03 Apr 2007)
New Revision: 62031

Modified:
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/util/test/TwiddleUnitTestCase.java
Log:
Add debugging to figure out why it fails in CC environment


Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/util/test/TwiddleUnitTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/util/test/TwiddleUnitTestCase.java	2007-04-03 13:00:24 UTC (rev 62030)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/util/test/TwiddleUnitTestCase.java	2007-04-03 13:39:59 UTC (rev 62031)
@@ -90,8 +90,8 @@
         command.add("cmd");
         command.add("/C");
         command.add("twiddle");
-        command.add("-s");
-        command.add(getServerHost());
+        //command.add("-s");
+        //command.add(getServerHost());
         command.addAll(Arrays.asList(args));
      }
      else
@@ -99,8 +99,8 @@
         command.add("/bin/sh");
         command.add("-c");
         String twiddleCmd = "./twiddle.sh ";
-        twiddleCmd += "-s ";
-        twiddleCmd += getServerHost();
+        //twiddleCmd += "-s ";
+        //twiddleCmd += getServerHost();
         twiddleCmd += makeTwiddleArgs(args);
         command.add(twiddleCmd);
      }
@@ -108,9 +108,17 @@
      ProcessBuilder builder = new ProcessBuilder(command);
      builder.directory(getTwiddleWorkingDir());
      Process proc = builder.start();
-     InputStream in = proc.getInputStream();
+     StringBuilder buffer = readStream(proc.getInputStream());
+
+     if (log.isDebugEnabled()) debugTwiddle(builder, buffer, proc.getErrorStream());
+
+     return buffer.toString();
+  }
+
+  protected StringBuilder readStream(InputStream in) throws IOException
+  {
+     StringBuilder buffer = new StringBuilder();
      int readByte = 0;
-     StringBuilder buffer = new StringBuilder();
      while (readByte != -1)
      {
        readByte = in.read();
@@ -119,10 +127,7 @@
           buffer.append((char)readByte);
        }
      }
-
-     if (log.isDebugEnabled()) debugTwiddle(builder, buffer);
-
-     return buffer.toString();
+     return buffer;
   }
 
   protected String makeTwiddleArgs(String[] args)
@@ -136,7 +141,9 @@
      return result;
   }
 
-  protected void debugTwiddle(ProcessBuilder builder, StringBuilder buffer)
+  protected void debugTwiddle(ProcessBuilder builder,  
+                              StringBuilder buffer, 
+                              InputStream errorStream) throws IOException
   {
      String command = "";
      for (String param: builder.command() )
@@ -147,6 +154,7 @@
 
      log.debug("executed: " + command);
      log.debug("returned: " + buffer.toString());
+     log.debug("error stream: " + readStream(errorStream).toString());
   }
 
   protected boolean isWindows()
@@ -161,6 +169,7 @@
      String jbossDist = System.getProperty("jboss.dist");
      if (jbossDist == null) throw new IllegalStateException("jboss.dist System property is not set");
      String jbossBin = jbossDist + "/bin";
+     log.debug("Twiddle working dir = " + jbossBin);
      return new File(jbossBin);
   }
 }