svn commit: r1485936 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java

[da...@apache.org]

Author: dag
Date: Fri May 24 05:52:31 2013
New Revision: 1485936

URL: http://svn.apache.org/r1485936
Log:
DERBY-6225 SecureServerTest assertion error on contents of stdout from subprocess

Patch changing the order of

a) the waiting for the process to finish
   starting and
b) read its standard output.

This is done to avoid a race condition in which we read the output
before it has been printed by the subprocess.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java?rev=1485936&r1=1485935&r2=1485936&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java Fri May 24 05:52:31 2013
@@ -316,8 +316,8 @@ public class SecureServerTest extends Ba
         throws Exception
     {	
         String      myName = toString();
-        String      serverOutput = getServerOutput();
         boolean     serverCameUp = serverCameUp();
+        String      serverOutput = getServerOutput();
         boolean     outputOK = ( serverOutput.indexOf( _outcome.expectedServerOutput() ) >= 0 );
 
         assertEquals( myName + ": serverCameUp = " + serverCameUp, _outcome.serverShouldComeUp(), serverCameUp );