From: Leif Åstrand <leif@vaadin.com>
Date: Tue, 15 Nov 2011 11:20:40 +0000 (+0000)
Subject: Possibly avoid missing locks by not cleaning up in the finally block, as another... 
X-Git-Tag: 7.0.0.alpha1~225^2~3^2~44
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=34a894f0da0f94c21e103778b242c66a7a9a5a6f;p=vaadin-framework.git

Possibly avoid missing locks by not cleaning up in the finally block, as another test might already have started and acquired the lock when the finally block is executed

svn changeset:21999/svn branch:6.7
---

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index d20e6cf599..d15ff6619d 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -352,6 +352,7 @@
 			</fileset>
 		</scp>
 		
+		<!-- trycatch probably not needed any more as it just fails with the original message and doesn't do anything in the finally block -->
 		<trycatch property="error_message">
 			<try>
 				<!-- timeout in one hour (remote end should timeout in 55 minutes) -->
@@ -394,18 +395,17 @@
 						</antcall>
 					</then>
 				</if>
-			</try>
-			<catch>
-				<fail message="${error_message}" />
-			</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" failonerror="false" />
 				<antcall target="echo-prefix">
 					<param name="prefix" value="${target-server}: " />
 					<param name="message" value="${stop-output}" />
 				</antcall>
-			</finally>
+			</try>
+			<catch>
+				<fail message="${error_message}" />
+			</catch>
 		</trycatch>
 	</target>