From 0cd52aea2c9637d0ed71c857f43c548af89e038f Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Thu, 27 Oct 2011 09:52:51 +0000
Subject: Added output of some debug information

svn changeset:21813/svn branch:6.7
---
 tests/integration_base_files/base.xml |  2 ++
 tests/integration_tests.xml           | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/integration_base_files/base.xml b/tests/integration_base_files/base.xml
index 995c3b5bbf..f9c2ff3d6b 100644
--- 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 acf5c1e703..834c5fe608 100644
--- 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}" />
 				
 				<!-- timeout in 15 minutes -->
-				<sshexec host="${target-host}" outputproperty="start-output" timeout="900000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml startup-and-deploy" />
+				<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" />
 				<antcall target="echo-prefix">
 					<param name="prefix" value="${target-server}: " />
 					<param name="message" value="${start-output}" />
 				</antcall>
+				
+				<fail message="${start-output}">
+					<condition>
+						<not>
+							<contains string="${start-output}" substring="Demo deployed successfully" />
+						</not>
+					</condition>
+				</fail>
 
 				<copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-${target-server}-servlet.html" overwrite="true" />
 				<antcall target="integration-test-servlet">
@@ -392,7 +400,7 @@
 			</catch>
 			<finally>
 				<!-- timeout in five minutes -->
-				<sshexec host="${target-host}" outputproperty="stop-output" timeout="300000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml shutdown-and-cleanup" />
+				<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" />
 				<antcall target="echo-prefix">
 					<param name="prefix" value="${target-server}: " />
 					<param name="message" value="${stop-output}" />
-- 
cgit v1.2.3