Added output of some debug information

svn changeset:21813/svn branch:6.7

diff --git a/tests/integration_base_files/base.xml b/tests/integration_base_files/base.xml
index 995c3b5bbf5342b4875afb73c4db07543b9d8070..f9c2ff3d6b68b3392a8623ee6ecc70db7623b99c 100644 (file)
--- a/tests/integration_base_files/base.xml
+++ b/tests/integration_base_files/base.xml
@@ -58,6 +58,8 @@
                <waitfor maxwait="${waitMinutes}" maxwaitunit="minute" checkevery="10000" timeoutproperty="timeout">
                         <http url="${waitUrl}" />
                </waitfor>
+               <!-- Print load averages to get an indicator on whether the server still attempts to start up -->
+               <exec executable="uptime" />
                <fail if="timeout" message="${server} failed to deploy" />
 
                <echo message="${server}: Demo deployed successfully." />

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index acf5c1e703641be65f2e3367cb85e75106b3456b..834c5fe6082d9288a273cd1b4096b163a3eddb7e 100644 (file)
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -364,11 +364,19 @@
                                <scp file="${demo.war}" todir="${user}@${target-host}:demo.war" keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" />\r
                                \r
                                <!-- timeout in 15 minutes -->\r
-                               <sshexec host="${target-host}" outputproperty="start-output" timeout="900000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml startup-and-deploy" />\r
+                               <sshexec host="${target-host}" outputproperty="start-output" timeout="900000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml startup-and-deploy" failonerror="false" />\r
                                <antcall target="echo-prefix">\r
                                        <param name="prefix" value="${target-server}: " />\r
                                        <param name="message" value="${start-output}" />\r
                                </antcall>\r
+                               \r
+                               <fail message="${start-output}">\r
+                                       <condition>\r
+                                               <not>\r
+                                                       <contains string="${start-output}" substring="Demo deployed successfully" />\r
+                                               </not>\r
+                                       </condition>\r
+                               </fail>\r
 \r
                                <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-${target-server}-servlet.html" overwrite="true" />\r
                                <antcall target="integration-test-servlet">\r
@@ -392,7 +400,7 @@
                        </catch>\r
                        <finally>\r
                                <!-- timeout in five minutes -->\r
-                               <sshexec host="${target-host}" outputproperty="stop-output" timeout="300000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml shutdown-and-cleanup" />\r
+                               <sshexec host="${target-host}" outputproperty="stop-output" timeout="300000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml shutdown-and-cleanup" failonerror="false" />\r
                                <antcall target="echo-prefix">\r
                                        <param name="prefix" value="${target-server}: " />\r
                                        <param name="message" value="${stop-output}" />\r