diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-11-08 17:28:27 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-11-08 17:28:27 +0200 |
| commit | 2eff8c02aba3d9dc0dd74b0aff9c114a3dc29201 (patch) | |
| tree | eab57b1272e486176ce348b8a067c71a17020007 /tests/integration_tests.xml | |
| parent | 6c78fecb9f28eb5f0f09c906199dbc4c6c55d50d (diff) | |
| parent | 8c740b94ba854c2fca9e337083b72a596fe72c05 (diff) | |
| download | vaadin-framework-2eff8c02aba3d9dc0dd74b0aff9c114a3dc29201.tar.gz vaadin-framework-2eff8c02aba3d9dc0dd74b0aff9c114a3dc29201.zip | |
Merge remote-tracking branch 'origin/6.8' into master
Diffstat (limited to 'tests/integration_tests.xml')
| -rw-r--r-- | tests/integration_tests.xml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index 0f5f7617ac..71bd31efa6 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -348,11 +348,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">
@@ -376,7 +384,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}" />
@@ -448,4 +456,4 @@ <target name="integration-test-clean">
<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} clean" />
</target>
-</project>
\ No newline at end of file +</project> |