Author: ekoneil Date: Tue Dec 28 14:03:22 2004 New Revision: 123573 URL: http://svn.apache.org/viewcvs?view=rev&rev=123573 Log: Commit patch contributed by Bryan Che for JIRA 129.
This fixes the NetUI server DRT problem where the tests wait for 5 minutes without deploying the webapp. The URL which is used to ensure that the server is started is set (by default) to http://localhost:8080/ and expects some webapp to be available there. Then, the DRTs deploy the coreWeb/ webapp and run the tests. Tested by using a clean Beehive build and ensuring that the DRTs run with a fresh Tomcat install. BB: self DRT: NetUI pass Modified: incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml incubator/beehive/trunk/netui/test/webapps/drt/build.xml incubator/beehive/trunk/netui/test/webapps/jsf/build.xml Modified: incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml?view=diff&rev=123573&p1=incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml&r1=123572&p2=incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml&r2=123573 ============================================================================== --- incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml (original) +++ incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml Tue Dec 28 14:03:22 2004 @@ -85,7 +85,8 @@ from the server, and upon success starts the client-side test harneess. Param: - waitfor.url == the URL at which to check to see if the server has started + waitfor.url == the URL at which to check to see if the server has started. + This should typically be the server's root url. formatter.type == type of formatter to use when writing reslts. formatter.usefile == whether to write results to an output file. drt.mode == flag describing whether running the tests in DRT mode. Modified: incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties?view=diff&rev=123573&p1=incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties&r1=123572&p2=incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties&r2=123573 ============================================================================== --- incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties (original) +++ incubator/beehive/trunk/netui/test/dist-test/ant/test-dist.properties Tue Dec 28 14:03:22 2004 @@ -13,7 +13,8 @@ # Test Webapp properties webapp.name=coreWeb webapp.dir=${build.dir}/webapps/${webapp.name} -webapp.waitfor.url=http://localhost:8080/${webapp.name} +server.root.url=http://localhost:8080 +webapp.waitfor.url=${server.root.url}/${webapp.name} # Webapp build properties netuiconfig.xml.name=netui-config.xml Modified: incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml?view=diff&rev=123573&p1=incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml&r1=123572&p2=incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml&r2=123573 ============================================================================== --- incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml (original) +++ incubator/beehive/trunk/netui/test/dist-test/ant/testWebBuild.xml Tue Dec 28 14:03:22 2004 @@ -76,7 +76,7 @@ <target name="drt" description="Run the drt suite with full server start / stop support."> <ant dir="${test.dir}" antfile="${test.dir}/ant/testRecorder.xml" inheritAll="false" target="server.test"> - <property name="waitfor.url" value="${webapp.waitfor.url}"/> + <property name="waitfor.url" value="${server.root.url}"/> <property name="suite.name" value="drt"/> <property name="playback.webapps" value="${webapp.name}"/> <property name="drt.mode" value="true"/> @@ -93,7 +93,7 @@ <target name="bvt" description="Run the bvt suite with full server start / stop support."> <ant antfile="${test.dir}/ant/testRecorder.xml" inheritAll="false" target="server.test"> - <property name="waitfor.url" value="${webapp.waitfor.url}"/> + <property name="waitfor.url" value="${server.root.url}"/> <property name="suite.name" value="bvt"/> <property name="playback.webapps" value="${webapp.name}"/> <property name="drt.mode" value="true"/> Modified: incubator/beehive/trunk/netui/test/webapps/drt/build.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/build.xml?view=diff&rev=123573&p1=incubator/beehive/trunk/netui/test/webapps/drt/build.xml&r1=123572&p2=incubator/beehive/trunk/netui/test/webapps/drt/build.xml&r2=123573 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/build.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/build.xml Tue Dec 28 14:03:22 2004 @@ -20,7 +20,8 @@ <property name="webapp.name" value="coreWeb"/> <property name="testRecorder.config.name" value="netui-server-drt-config"/> - <property name="webapp.waitfor.url" value="http://localhost:8080/${webapp.name}"/> + <property name="server.root.url" value="http://localhost:8080"/> + <property name="webapp.waitfor.url" value="${server.root.url}/${webapp.name}"/> <!-- ================================================================ --> <!-- --> @@ -123,7 +124,8 @@ <target name="drt" description="Run the drt suite with full server start / stop support."> <ant dir="${test.dir}" antfile="${test.dir}/ant/testRecorder.xml" inheritAll="false" target="server.test"> <property name="app.build.file" location="${app.dir}/drt/build.xml"/> - <property name="waitfor.url" value="${webapp.waitfor.url}"/> + <!-- Wait for the server's root url to see if the server has started --> + <property name="waitfor.url" value="${server.root.url}"/> <property name="suite.name" value="drt"/> <property name="playback.webapps" value="${webapp.name}"/> <property name="drt.mode" value="true"/> @@ -133,7 +135,8 @@ <target name="bvt" description="Run the bvt suite with full server start / stop support."> <ant antfile="${test.dir}/ant/testRecorder.xml" inheritAll="false" target="server.test"> <property name="app.build.file" location="${app.dir}/drt/build.xml"/> - <property name="waitfor.url" value="${webapp.waitfor.url}"/> + <!-- Wait for the server's root url to see if the server has started --> + <property name="waitfor.url" value="${server.root.url}"/> <property name="suite.name" value="bvt"/> <property name="playback.webapps" value="${webapp.name}"/> <property name="drt.mode" value="true"/> Modified: incubator/beehive/trunk/netui/test/webapps/jsf/build.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/jsf/build.xml?view=diff&rev=123573&p1=incubator/beehive/trunk/netui/test/webapps/jsf/build.xml&r1=123572&p2=incubator/beehive/trunk/netui/test/webapps/jsf/build.xml&r2=123573 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/jsf/build.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/jsf/build.xml Tue Dec 28 14:03:22 2004 @@ -11,7 +11,8 @@ <property name="webapp.name" value="jsfWeb"/> <property name="testRecorder.config.name" value="netui-server-jsf-config"/> - <property name="webapp.waitfor.url" value="http://localhost:8080/${webapp.name}"/> + <property name="server.root.url" value="http://localhost:8080"/> + <property name="webapp.waitfor.url" value="${server.root.url}/${webapp.name}"/> <!-- ================================================================ --> <!-- --> @@ -78,7 +79,8 @@ <property name="suite.name" value="drt"/> <property name="drt.mode" value="true"/> <property name="playback.webapps" value="${webapp.name}"/> - <property name="waitfor.url" value="${webapp.waitfor.url}"/> + <!-- Wait for the server's root url to see if the server has started --> + <property name="waitfor.url" value="${server.root.url}"/> </ant> </target>
