From b3d2375271ec5b6c412133a2937a7af7bbec98e2 Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Wed, 11 May 2016 12:11:45 +0000 Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1) 126578 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 124729 jvonka: RA-773: Try bumping retry count for async rendition creation on build m/c (SharedLinkApiTest) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/rest/api/tests/AbstractBaseApiTest.java | 6 +++++- source/test-java/org/alfresco/rest/api/tests/ApiTest.java | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java b/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java index c03c89d0b2..cb66c3e5f0 100644 --- a/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java @@ -426,7 +426,7 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi } protected static final long PAUSE_TIME = 5000; //millisecond - protected static final int MAX_RETRY = 10; + protected static final int MAX_RETRY = 20; protected Rendition waitAndGetRendition(String userId, String sourceNodeId, String renditionId) throws Exception { @@ -446,6 +446,8 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi // If the asynchronous create rendition action is not finished yet, // wait for 'PAUSE_TIME' and try again. retryCount++; + + System.out.println("waitAndGetRendition: "+retryCount); Thread.sleep(PAUSE_TIME); } } @@ -472,6 +474,8 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi // If no transformer is currently available, // wait for 'PAUSE_TIME' and try again. retryCount++; + + System.out.println("waitAndGetRendition: "+retryCount); Thread.sleep(PAUSE_TIME); } } diff --git a/source/test-java/org/alfresco/rest/api/tests/ApiTest.java b/source/test-java/org/alfresco/rest/api/tests/ApiTest.java index 0014b7a50a..e7188715f2 100644 --- a/source/test-java/org/alfresco/rest/api/tests/ApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/ApiTest.java @@ -38,8 +38,9 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ NodeApiTest.class, - SharedLinkApiTest.class, QueriesApiTest.class, + RenditionsTest.class, + SharedLinkApiTest.class, ActivitiesPostingTest.class, TestSites.class, TestNodeComments.class, @@ -59,8 +60,7 @@ import org.junit.runners.Suite; TestRemovePermissions.class, TestPublicApi128.class, TestPublicApiCaching.class, - ModulePackagesApiTest.class, - RenditionsTest.class + ModulePackagesApiTest.class }) public class ApiTest {