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

Merged HEAD (5.1) to 5.1.N (5.1.1)

Browse Source 
117625 sglover: ACE-4347 "5.1 Build has had three transient failures related to locking"
   Increase timeouts in JobLockServiceTest tests to account for slower database updates


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117991 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Natalia Smintanca
2015-11-19 09:29:47 +00:00
parent 49a7b3d584
commit 9b21aed622
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/test-java/org/alfresco/repo/lock/JobLockServiceTest.java
View File

@@ -508,7 +508,8 @@ public class JobLockServiceTest extends TestCase
if (t==3)
{
long ttlLongerThanDefaultRetry = 300;
// default num retries * default retry wait + time to create lock (pessimistic)
long ttlLongerThanDefaultRetry = 10*20 + 2000;
tokenB = jobLockService.getLock(lockA, ttlLongerThanDefaultRetry);
}
@@ -528,7 +529,7 @@ public class JobLockServiceTest extends TestCase
callback.isActive = false;
Thread.sleep(40);
Thread.sleep(1000); // need to make this quite long to account for slow database updates
assertEquals(true,callback.released);
assertEquals(2,callback.isActiveCount);