From 4c2d58fa31b368e9f79c30dcf733a67d0a0ef981 Mon Sep 17 00:00:00 2001 From: Jamal Kaabi-Mofrad Date: Tue, 10 May 2016 11:37:27 +0000 Subject: [PATCH] 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/HEAD/root@126578 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 8d169649d0..b9522b7109 100644 --- a/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java @@ -419,7 +419,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 { @@ -439,6 +439,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); } } @@ -465,6 +467,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 27ff136069..95149184b7 100644 --- a/source/test-java/org/alfresco/rest/api/tests/ApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/ApiTest.java @@ -13,8 +13,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, @@ -34,8 +35,7 @@ import org.junit.runners.Suite; TestRemovePermissions.class, TestPublicApi128.class, TestPublicApiCaching.class, - ModulePackagesApiTest.class, - RenditionsTest.class + ModulePackagesApiTest.class }) public class ApiTest {