diff options
| author | Mikael Grankvist <mikael.grankvist@itmill.com> | 2010-06-23 06:48:07 +0000 |
|---|---|---|
| committer | Mikael Grankvist <mikael.grankvist@itmill.com> | 2010-06-23 06:48:07 +0000 |
| commit | 82a2d57c5417977c60fc3a57eceb88abd25b1780 (patch) | |
| tree | 809d1d3f63e19724d3e9b5b50568ae9e22a5a974 /tests/integration_tests.xml | |
| parent | ca7dba8299f74fcf3a4e59219ee6d5d88cc4191b (diff) | |
| download | vaadin-framework-82a2d57c5417977c60fc3a57eceb88abd25b1780.tar.gz vaadin-framework-82a2d57c5417977c60fc3a57eceb88abd25b1780.zip | |
Integration test update.
(Teamcity messages, failure tolerance)
svn changeset:13873/svn branch:6.4
Diffstat (limited to 'tests/integration_tests.xml')
| -rw-r--r-- | tests/integration_tests.xml | 103 |
1 files changed, 56 insertions, 47 deletions
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index 67784e736b..0e364c5936 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -377,54 +377,61 @@ <antcall target="integration-test-get-lock" />
<echo message="Got lock" />
- <antcall target="integration-test-upload-demo" />
+ <trycatch property="tried">
+ <try>
+ <antcall target="integration-test-upload-demo" />
+
+ <antcall target="run-integration-test">
+ <param name="target-server" value="tomcat4"/>
+ </antcall>
+ <antcall target="run-integration-test">
+ <param name="target-server" value="tomcat5"/>
+ </antcall>
+ <antcall target="run-integration-test">
+ <param name="target-server" value="tomcat6"/>
+ </antcall>
+ <antcall target="run-integration-test">
+ <param name="target-server" value="jetty5"/>
+ </antcall>
+ <antcall target="run-integration-test">
+ <param name="target-server" value="jetty6"/>
+ </antcall>
+ <antcall target="run-integration-test">
+ <param name="target-server" value="jetty7"/>
+ </antcall>
+ <antcall target="run-integration-test">
+ <param name="target-server" value="jboss3"/>
+ </antcall>
+ <antcall target="run-integration-test">
+ <param name="target-server" value="jboss4"/>
+ </antcall>
+ <antcall target="run-integration-test">
+ <param name="target-server" value="jboss5"/>
+ </antcall>
+ <antcall target="run-integration-test">
+ <param name="target-server" value="glassfish2"/>
+ </antcall>
+ <antcall target="run-integration-test">
+ <param name="target-server" value="glassfish3"/>
+ </antcall>
+ <antcall target="run-integration-test">
+ <param name="target-server" value="liferay"/>
+ </antcall>
+ <antcall target="run-integration-test">
+ <param name="target-server" value="weblogic9"/>
+ </antcall>
+ <antcall target="run-integration-test">
+ <param name="target-server" value="weblogic10"/>
+ </antcall>
+ <antcall target="run-integration-test">
+ <param name="target-server" value="GAE"/>
+ </antcall>
+ </try>
+ <catch>
+ <echo message="Uploading of demo.war failed. ${tried}" />
+ </catch>
+ </trycatch>
- <antcall target="run-integration-test">
- <param name="target-server" value="tomcat4"/>
- </antcall>
- <antcall target="run-integration-test">
- <param name="target-server" value="tomcat5"/>
- </antcall>
- <antcall target="run-integration-test">
- <param name="target-server" value="tomcat6"/>
- </antcall>
- <antcall target="run-integration-test">
- <param name="target-server" value="jetty5"/>
- </antcall>
- <antcall target="run-integration-test">
- <param name="target-server" value="jetty6"/>
- </antcall>
- <antcall target="run-integration-test">
- <param name="target-server" value="jetty7"/>
- </antcall>
- <antcall target="run-integration-test">
- <param name="target-server" value="jboss3"/>
- </antcall>
- <antcall target="run-integration-test">
- <param name="target-server" value="jboss4"/>
- </antcall>
- <antcall target="run-integration-test">
- <param name="target-server" value="jboss5"/>
- </antcall>
- <antcall target="run-integration-test">
- <param name="target-server" value="glassfish2"/>
- </antcall>
- <antcall target="run-integration-test">
- <param name="target-server" value="glassfish3"/>
- </antcall>
- <antcall target="run-integration-test">
- <param name="target-server" value="liferay"/>
- </antcall>
- <antcall target="run-integration-test">
- <param name="target-server" value="weblogic9"/>
- </antcall>
- <antcall target="run-integration-test">
- <param name="target-server" value="weblogic10"/>
- </antcall>
- <antcall target="run-integration-test">
- <param name="target-server" value="GAE"/>
- </antcall>
-
<antcall target="integration-test-clean" />
<echo message="Getting lock" />
<antcall target="integration-test-release-lock" />
@@ -432,6 +439,7 @@ </target>
<target name="run-integration-test">
+ <echo message="##teamcity[testStarted name='${target-server}']" />
<trycatch property="tried">
<try>
<antcall target="integration-test-${target-server}" />
@@ -440,6 +448,7 @@ <echo message="##teamcity[testFailed name='${target-server}' message='Integration test for ${target-server} failed.' details='${tried}']" />
</catch>
</trycatch>
+ <echo message="##teamcity[testFinished name='${target-server}']" />
</target>
<target name="integration-test-get-lock">
|