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

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
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
This commit is contained in:
Ancuta Morarasu
2016-05-11 12:11:45 +00:00
parent 8570181ea2
commit b3d2375271
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
View File

@@ -426,7 +426,7 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
} }
protected static final long PAUSE_TIME = 5000; //millisecond 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 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, // If the asynchronous create rendition action is not finished yet,
// wait for 'PAUSE_TIME' and try again. // wait for 'PAUSE_TIME' and try again.
retryCount++; retryCount++;
System.out.println("waitAndGetRendition: "+retryCount);
Thread.sleep(PAUSE_TIME); Thread.sleep(PAUSE_TIME);
} }
} }
@@ -472,6 +474,8 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
// If no transformer is currently available, // If no transformer is currently available,
// wait for 'PAUSE_TIME' and try again. // wait for 'PAUSE_TIME' and try again.
retryCount++; retryCount++;
System.out.println("waitAndGetRendition: "+retryCount);
Thread.sleep(PAUSE_TIME); Thread.sleep(PAUSE_TIME);
} }
} }

6
source/test-java/org/alfresco/rest/api/tests/ApiTest.java
View File

@@ -38,8 +38,9 @@ import org.junit.runners.Suite;
@RunWith(Suite.class) @RunWith(Suite.class)
@Suite.SuiteClasses({ @Suite.SuiteClasses({
NodeApiTest.class, NodeApiTest.class,
SharedLinkApiTest.class,
QueriesApiTest.class, QueriesApiTest.class,
RenditionsTest.class,
SharedLinkApiTest.class,
ActivitiesPostingTest.class, ActivitiesPostingTest.class,
TestSites.class, TestSites.class,
TestNodeComments.class, TestNodeComments.class,
@@ -59,8 +60,7 @@ import org.junit.runners.Suite;
TestRemovePermissions.class, TestRemovePermissions.class,
TestPublicApi128.class, TestPublicApi128.class,
TestPublicApiCaching.class, TestPublicApiCaching.class,
ModulePackagesApiTest.class, ModulePackagesApiTest.class
RenditionsTest.class
}) })
public class ApiTest public class ApiTest
{ {