You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2013/07/03 21:39:35 UTC
svn commit: r1499537 - in /db/derby/code/branches/10.10: ./
java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
Author: kmarsden
Date: Wed Jul 3 19:39:34 2013
New Revision: 1499537
URL: http://svn.apache.org/r1499537
Log:
DERBY-6225 SecureServerTest assertion error on contents of stdout from subprocess
merge revision 1485936 from trunk
Modified:
db/derby/code/branches/10.10/ (props changed)
db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
Propchange: db/derby/code/branches/10.10/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1485936
Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java?rev=1499537&r1=1499536&r2=1499537&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java (original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java Wed Jul 3 19:39:34 2013
@@ -324,8 +324,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 );