inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
59746: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59561: Merged DEV to V4.2-BUG-FIX (4.2.1)
         59104: MNT-10197 : Intermittent test failure: RenditionServicePermissionsTest.userWithoutDeleteAccessTo(etc)
         Implemented a retry mechanism to solve the intermittent test failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62185 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 08:00:32 +00:00
parent ad1026086f
commit 63d70eecee
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
source/test-java/org/alfresco/repo/rendition/RenditionServicePermissionsTest.java
View File

@@ -19,10 +19,6 @@
package org.alfresco.repo.rendition;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
@@ -74,6 +70,8 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.RuleChain;
import static org.junit.Assert.*;
/**
* @author Neil McErlean
* @since 3.3
@@ -419,19 +417,34 @@ public class RenditionServicePermissionsTest
return null;
}
});
// FIXME Yuck. Sleeping to wait for the completion of the above async action.
Thread.sleep(2000);
// Now to check that the node has no renditions as the previous one should have been deleted.
transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
int waitTime = 200;
int numRetries = 20;
// Try and retry for 200ms up to 4s
for (int i = 1 ; i <= numRetries; i++)
{
public Void execute() throws Throwable
Thread.sleep(waitTime * i);
// Now to check that the node has no renditions as the previous one should have been deleted.
Boolean hasNoRenditions = transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Boolean>()
{
assertTrue(renditionService.getRenditions(imgNode).isEmpty());
return null;
public Boolean execute() throws Throwable
{
return renditionService.getRenditions(imgNode).isEmpty();
}
});
if (hasNoRenditions)
{
//test passed
break;
}
});
else if (i == numRetries)
{
// the last try, time to fail
fail("The node should have no renditions.");
}
}
}
/**