[jboss-cvs] jbosstest build.xml

[Ben W. <bw...@us...>]

  User: bwang00 
  Date: 05/01/13 22:05:27

  Modified:    .        build.xml
  Log:
  Run tests-cluester with different config settings
  
  Revision  Changes    Path
  1.437     +41 -12    jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.436
  retrieving revision 1.437
  diff -u -r1.436 -r1.437
  --- build.xml	8 Jan 2005 19:15:02 -0000	1.436
  +++ build.xml	14 Jan 2005 06:05:25 -0000	1.437
  @@ -6,7 +6,7 @@
   <!--  See terms of license at http://www.gnu.org.                 -->
   <!-- ============================================================ -->
   
  -<!-- $Id: build.xml,v 1.436 2005/01/08 19:15:02 bwang00 Exp $ -->
  +<!-- $Id: build.xml,v 1.437 2005/01/14 06:05:25 bwang00 Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
      <import file="../tools/etc/buildmagic/build-common.xml"/>
  @@ -635,16 +635,7 @@
      <target name="tests-clustering"
         description="Execute clustering tests requiring two nodes.">
         <antcall target="tests-clustering-startup" />
  -      <echo message="Waiting for nodes to start..."/>
  -      <waitfor maxwait="120" maxwaitunit="second"
  -         checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout">
  -         <and>
  -            <http url="${node0.http.url}"/>
  -            <http url="${node1.http.url}"/>
  -         </and>
  -      </waitfor>
  -      <fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
  -      <echo message="Nodes have started, waiting for cluster to stablize..."/>
  +      <antcall target="tests-clustering-wait" />
   
         <!-- Need a custom condition that queries for the node membership == 2 -->
         <echo message="Going to call target tests-clustering-unit"/>
  @@ -653,17 +644,55 @@
            <param name="cluster.includes.refid" value="cluster.includes"/>
         </antcall>
         <antcall target="tests-clustering-shutdown" />
  +
  +      <sleep seconds="4"/>
  +
  +      <echo message="Going to call target tests-clustering-unit again with new configuration"/>
  +
  +      <antcall target="tests-clustering-startup-with-config-change" />
  +      <antcall target="tests-clustering-wait" />
  +
  +      <antcall target="tests-clustering-unit">
  +         <param name="cluster.includes.refid" value="cluster.includes"/>
  +      </antcall>
  +      <antcall target="tests-clustering-shutdown" />
      </target>
  +
      <target name="tests-clustering-startup" unless="${tests.clustering.skip.startup}">
         <create-cluster-node conf="node0"/>
         <start-jboss  conf="node0" host="${node0}"/>
         <create-cluster-node conf="node1"/>
  -      <start-jboss  conf="node1" host="${node1}"/>      
  +      <start-jboss  conf="node1" host="${node1}"/>
  +   </target>
  +
  +   <target name="tests-clustering-startup-with-config-change" unless="${tests.clustering.skip.startup}">
  +      <create-cluster-node conf="node0"/>
  +      <create-cluster-node conf="node1"/>
  +
  +      <echo message="Modifying the node0 and node1 Tomcat configuration"/>
  +      <http-cluster-node-config-change conf="node0"/>
  +      <http-cluster-node-config-change conf="node1"/>
  +
  +      <start-jboss  conf="node0" host="${node0}"/>
  +      <start-jboss  conf="node1" host="${node1}"/>
      </target>
  +
      <target name="tests-clustering-shutdown" unless="${tests.clustering.skip.startup}">
         <stop-jboss url="${node0.jndi.url}"/>
         <stop-jboss url="${node1.jndi.url}"/>
      </target>
  +   <target name="tests-clustering-wait" unless="${tests.clustering.skip.startup}">
  +      <echo message="Waiting for nodes to start..."/>
  +      <waitfor maxwait="120" maxwaitunit="second"
  +         checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout">
  +         <and>
  +            <http url="${node0.http.url}"/>
  +            <http url="${node1.http.url}"/>
  +         </and>
  +      </waitfor>
  +      <fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
  +      <echo message="Nodes have started, waiting for cluster to stablize..."/>
  +   </target>
   
      <!-- Tests of tomcat needing a ssl connector
      -->