From 1fcdf651b30e02481a733b1683656b3d39b822ea Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 19:36:37 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 57102: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3) 56608: ALF-20095 : Test failure in TestEnterpriseAtomPubTCK Correct ContentDiskDriverTest test. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/filesys/repo/ContentDiskDriverTest.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/source/test-java/org/alfresco/filesys/repo/ContentDiskDriverTest.java b/source/test-java/org/alfresco/filesys/repo/ContentDiskDriverTest.java index d7d1d8aeda..0dc45df705 100644 --- a/source/test-java/org/alfresco/filesys/repo/ContentDiskDriverTest.java +++ b/source/test-java/org/alfresco/filesys/repo/ContentDiskDriverTest.java @@ -4945,7 +4945,16 @@ public class ContentDiskDriverTest extends TestCase // clean up so we could run the test again - //driver.deleteFile(testSession, testConnection, FILE_PATH); + RetryingTransactionCallback deleteFile = new RetryingTransactionCallback() { + + @Override + public Void execute() throws Throwable + { + driver.deleteFile(testSession, testConnection, FILE_PATH); + return null; + } + }; + tran.doInTransaction(deleteFile, false, true); } // test set modified scenario