[jboss-cvs] JBossAS SVN: r87698 - in branches/Branch_5_x/testsuite: imports and 1 other directory.

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

Author: smcgowan at redhat.com
Date: 2009-04-22 20:47:24 -0400 (Wed, 22 Apr 2009)
New Revision: 87698

Modified:
   branches/Branch_5_x/testsuite/build.xml
   branches/Branch_5_x/testsuite/imports/server-config.xml
Log:
JBAS-6770 - increase timeout for runs on Hudson

Modified: branches/Branch_5_x/testsuite/build.xml
===================================================================
--- branches/Branch_5_x/testsuite/build.xml	2009-04-23 00:46:48 UTC (rev 87697)
+++ branches/Branch_5_x/testsuite/build.xml	2009-04-23 00:47:24 UTC (rev 87698)
@@ -620,7 +620,7 @@
    <!-- ================================================================== -->
 
    <macrodef name="wait-on-host">
-      <attribute name="seconds" default="240"/>
+      <attribute name="seconds" default="300"/>
       <attribute name="host" default="${node0}"/>
       <sequential>
          <echo message="Waiting for @{host} to start..."/>
@@ -633,13 +633,14 @@
    </macrodef>
 
    <macrodef name="wait-on-shutdown">
-      <attribute name="seconds" default="240"/>
+      <attribute name="seconds" default="300"/>
       <attribute name="conf"/>
+      <attribute name="serverlog" default="${jboss.dist}/server/@{conf}/log/server.log"/>
       <sequential>
          <echo message="Waiting for '@{conf}' server to stop..."/>
          <waitfor maxwait="@{seconds}" maxwaitunit="second"
             checkevery="5" checkeveryunit="second" timeoutproperty="shutdown.timeout">
-            <available file="server.log">
+            <available file="@{serverlog}">
                <filepath>
                   <fileset dir="${jboss.dist}/server/@{conf}/log/" includes="server.log">
                      <contains text="[org.jboss.bootstrap.microcontainer.ServerImpl] (JBoss Shutdown Hook) Shutdown complete"/>

Modified: branches/Branch_5_x/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_5_x/testsuite/imports/server-config.xml	2009-04-23 00:46:48 UTC (rev 87697)
+++ branches/Branch_5_x/testsuite/imports/server-config.xml	2009-04-23 00:47:24 UTC (rev 87698)
@@ -924,7 +924,6 @@
             <jvmarg line="${jpda.cmdline}" />
             <jvmarg line="@{jvmargs}" />
             <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
-            <sysproperty key="jboss.server.log.threshold" value="DEBUG" />
             <arg value="-c"/>
             <arg value="@{conf}"/>
             <arg value="-b"/>