diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-10-21 12:26:29 +0000 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-10-21 12:26:29 +0000 |
| commit | 70cda8a2235d5c1c56b51e46e307f78dffc14f32 (patch) | |
| tree | 7116139b7974452ebd896e254f0d51cb4a45c75f /tests/integration_tests.xml | |
| parent | 9fc552aa74a366b68575354934949c6b985df3a5 (diff) | |
| download | vaadin-framework-70cda8a2235d5c1c56b51e46e307f78dffc14f32.tar.gz vaadin-framework-70cda8a2235d5c1c56b51e46e307f78dffc14f32.zip | |
Added testing for jboss6 (#7371) and jboss7 (#7372)
Moved more stuff inside a try-finally block
svn changeset:21774/svn branch:6.7
Diffstat (limited to 'tests/integration_tests.xml')
| -rw-r--r-- | tests/integration_tests.xml | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index 9ea94b9648..acf5c1e703 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -163,7 +163,21 @@ <param name="target-server" value="jboss5" />
</antcall>
</target>
-
+
+ <target name="integration-test-jboss6">
+ <antcall target="run-generic-integration-test">
+ <param name="startDelay" value="300" />
+ <param name="target-server" value="jboss6" />
+ </antcall>
+ </target>
+
+ <target name="integration-test-jboss7">
+ <antcall target="run-generic-integration-test">
+ <param name="startDelay" value="300" />
+ <param name="target-server" value="jboss7" />
+ </antcall>
+ </target>
+
<target name="integration-test-glassfish2">
<antcall target="run-generic-integration-test">
<param name="startDelay" value="300" />
@@ -298,6 +312,8 @@ <antcall target="integration-test-jboss3" />
<antcall target="integration-test-jboss4" />
<antcall target="integration-test-jboss5" />
+ <antcall target="integration-test-jboss6" />
+ <antcall target="integration-test-jboss7" />
<antcall target="integration-test-jetty5" />
<antcall target="integration-test-jetty6" />
<antcall target="integration-test-jetty7" />
@@ -335,17 +351,18 @@ <include name="*" />
</fileset>
</scp>
- <!-- timeout in one hour (remote end should timeout in 55 minutes) -->
- <sshexec host="${target-host}" outputproperty="lock-output" timeout="3600000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="chmod +x *.sh; ant -f deploy.xml get-lock" />
- <antcall target="echo-prefix">
- <param name="prefix" value="${target-server}: " />
- <param name="message" value="${lock-output}" />
- </antcall>
-
- <scp file="${demo.war}" todir="${user}@${target-host}:demo.war" keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" />
<trycatch property="error_message">
<try>
+ <!-- timeout in one hour (remote end should timeout in 55 minutes) -->
+ <sshexec host="${target-host}" outputproperty="lock-output" timeout="3600000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="chmod +x *.sh; ant -f deploy.xml get-lock" />
+ <antcall target="echo-prefix">
+ <param name="prefix" value="${target-server}: " />
+ <param name="message" value="${lock-output}" />
+ </antcall>
+
+ <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" />
<antcall target="echo-prefix">
|