Integration test update.

(Teamcity messages, failure tolerance)

svn changeset:13873/svn branch:6.4

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 67784e736b944156ca779c78d51be2b24ac56792..0e364c59364445bbdb81068d23eecac212da9d17 100644 (file)
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -377,54 +377,61 @@
                <antcall target="integration-test-get-lock" />\r
                <echo message="Got lock" />\r
                \r
-               <antcall target="integration-test-upload-demo" />\r
+               <trycatch property="tried">\r
+                       <try>\r
+                               <antcall target="integration-test-upload-demo" />\r
+               \r
+                               <antcall target="run-integration-test">\r
+                                       <param name="target-server" value="tomcat4"/>\r
+                               </antcall>\r
+                               <antcall target="run-integration-test">\r
+                                       <param name="target-server" value="tomcat5"/>\r
+                               </antcall>\r
+                               <antcall target="run-integration-test">\r
+                                       <param name="target-server" value="tomcat6"/>\r
+                               </antcall>\r
+                               <antcall target="run-integration-test">\r
+                                       <param name="target-server" value="jetty5"/>\r
+                               </antcall>\r
+                               <antcall target="run-integration-test">\r
+                                       <param name="target-server" value="jetty6"/>\r
+                               </antcall>\r
+                               <antcall target="run-integration-test">\r
+                                       <param name="target-server" value="jetty7"/>\r
+                               </antcall>\r
+                               <antcall target="run-integration-test">\r
+                                       <param name="target-server" value="jboss3"/>\r
+                               </antcall>\r
+                               <antcall target="run-integration-test">\r
+                                       <param name="target-server" value="jboss4"/>\r
+                               </antcall>\r
+                               <antcall target="run-integration-test">\r
+                                       <param name="target-server" value="jboss5"/>\r
+                               </antcall>\r
+                               <antcall target="run-integration-test">\r
+                                       <param name="target-server" value="glassfish2"/>\r
+                               </antcall>\r
+                               <antcall target="run-integration-test">\r
+                                       <param name="target-server" value="glassfish3"/>\r
+                               </antcall>\r
+                               <antcall target="run-integration-test">\r
+                                       <param name="target-server" value="liferay"/>\r
+                               </antcall>\r
+                               <antcall target="run-integration-test">\r
+                                       <param name="target-server" value="weblogic9"/>\r
+                               </antcall>\r
+                               <antcall target="run-integration-test">\r
+                                       <param name="target-server" value="weblogic10"/>\r
+                               </antcall>\r
+                               <antcall target="run-integration-test">\r
+                                       <param name="target-server" value="GAE"/>\r
+                               </antcall>\r
+                       </try>\r
+                       <catch>\r
+                               <echo message="Uploading of demo.war failed. ${tried}" />\r
+                       </catch>\r
+               </trycatch>\r
                \r
-               <antcall target="run-integration-test">\r
-                       <param name="target-server" value="tomcat4"/>\r
-               </antcall>\r
-               <antcall target="run-integration-test">\r
-                       <param name="target-server" value="tomcat5"/>\r
-               </antcall>\r
-               <antcall target="run-integration-test">\r
-                       <param name="target-server" value="tomcat6"/>\r
-               </antcall>\r
-               <antcall target="run-integration-test">\r
-                       <param name="target-server" value="jetty5"/>\r
-               </antcall>\r
-               <antcall target="run-integration-test">\r
-                       <param name="target-server" value="jetty6"/>\r
-               </antcall>\r
-               <antcall target="run-integration-test">\r
-                       <param name="target-server" value="jetty7"/>\r
-               </antcall>\r
-               <antcall target="run-integration-test">\r
-                       <param name="target-server" value="jboss3"/>\r
-               </antcall>\r
-               <antcall target="run-integration-test">\r
-                       <param name="target-server" value="jboss4"/>\r
-               </antcall>\r
-               <antcall target="run-integration-test">\r
-                       <param name="target-server" value="jboss5"/>\r
-               </antcall>\r
-               <antcall target="run-integration-test">\r
-                       <param name="target-server" value="glassfish2"/>\r
-               </antcall>\r
-               <antcall target="run-integration-test">\r
-                       <param name="target-server" value="glassfish3"/>\r
-               </antcall>\r
-               <antcall target="run-integration-test">\r
-                       <param name="target-server" value="liferay"/>\r
-               </antcall>\r
-               <antcall target="run-integration-test">\r
-                       <param name="target-server" value="weblogic9"/>\r
-               </antcall>\r
-               <antcall target="run-integration-test">\r
-                       <param name="target-server" value="weblogic10"/>\r
-               </antcall>\r
-               <antcall target="run-integration-test">\r
-                       <param name="target-server" value="GAE"/>\r
-               </antcall>\r
-\r
                <antcall target="integration-test-clean" />\r
                <echo message="Getting lock" />\r
                <antcall target="integration-test-release-lock" />\r
@@ -432,6 +439,7 @@
        </target>\r
        \r
        <target name="run-integration-test">\r
+               <echo message="##teamcity[testStarted name='${target-server}']" />\r
                <trycatch property="tried">\r
                        <try>\r
                                <antcall target="integration-test-${target-server}" />\r
@@ -440,6 +448,7 @@
                                <echo message="##teamcity[testFailed name='${target-server}' message='Integration test for ${target-server} failed.' details='${tried}']" />\r
                        </catch>\r
                </trycatch>\r
+               <echo message="##teamcity[testFinished name='${target-server}']" />\r
        </target>\r
        \r
        <target name="integration-test-get-lock">\r