Possibly avoid missing locks by not cleaning up in the finally block, as another...

svn changeset:21999/svn branch:6.7

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