Author: ritchiem Date: Thu Sep 17 11:37:29 2009 New Revision: 816150 URL: http://svn.apache.org/viewvc?rev=816150&view=rev Log: Update to QpidTestCase to only check for broker.stopped lines until we have found the ready line. Added broker.stopped line to cpp.testprofile 'Exception constructed' this identifies port conflict issues. Local testing has shown that this works as expected.
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java qpid/trunk/qpid/java/test-profiles/cpp.testprofile qpid/trunk/qpid/java/test-profiles/default.testprofile Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=816150&r1=816149&r2=816150&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java Thu Sep 17 11:37:29 2009 @@ -337,7 +337,7 @@ latch.countDown(); } - if (latch != null && line.contains(stopped)) + if (!seenReady && line.contains(stopped)) { stopLine = line; } Modified: qpid/trunk/qpid/java/test-profiles/cpp.testprofile URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.testprofile?rev=816150&r1=816149&r2=816150&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/cpp.testprofile (original) +++ qpid/trunk/qpid/java/test-profiles/cpp.testprofile Thu Sep 17 11:37:29 2009 @@ -8,6 +8,7 @@ broker.module.ssl=${module.dir}/ssl.so broker.module.cluster=${module.dir}/cluster.so broker.module.store=${store.module.dir}/msgstore.so +broker.stopped=Exception constructed broker.modules= broker.args= Modified: qpid/trunk/qpid/java/test-profiles/default.testprofile URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/default.testprofile?rev=816150&r1=816149&r2=816150&view=diff ============================================================================== --- qpid/trunk/qpid/java/test-profiles/default.testprofile (original) +++ qpid/trunk/qpid/java/test-profiles/default.testprofile Thu Sep 17 11:37:29 2009 @@ -18,9 +18,10 @@ test.port=15672 test.mport=18999 +#Note : Management will start open second port on: mport + 100 : 19099 test.port.ssl=15671 -test.port.alt=15772 -test.port.alt.ssl=15771 +test.port.alt=25672 +test.port.alt.ssl=25671 test.exclude=true profile.excludes=08TransientExcludes --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org