mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Fix up test so failing async thumbnail creation does not cause test to wait indefinately
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -37,7 +37,6 @@ import org.alfresco.service.cmr.repository.ContentWriter;
|
|||||||
import org.alfresco.service.cmr.repository.NodeRef;
|
import org.alfresco.service.cmr.repository.NodeRef;
|
||||||
import org.alfresco.service.cmr.repository.NodeService;
|
import org.alfresco.service.cmr.repository.NodeService;
|
||||||
import org.alfresco.util.GUID;
|
import org.alfresco.util.GUID;
|
||||||
import org.apache.tools.ant.taskdefs.Sleep;
|
|
||||||
import org.json.JSONArray;
|
import org.json.JSONArray;
|
||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
import org.springframework.mock.web.MockHttpServletResponse;
|
import org.springframework.mock.web.MockHttpServletResponse;
|
||||||
@@ -173,8 +172,15 @@ public class ThumbnailServiceTest extends BaseWebScriptTest
|
|||||||
{
|
{
|
||||||
String url = "/api/node/" + node.getStoreRef().getProtocol() + "/" + node.getStoreRef().getIdentifier() + "/" + node.getId() + "/content/thumbnails/" + thumbnailName;
|
String url = "/api/node/" + node.getStoreRef().getProtocol() + "/" + node.getStoreRef().getIdentifier() + "/" + node.getId() + "/content/thumbnails/" + thumbnailName;
|
||||||
|
|
||||||
|
int retrys = 10;
|
||||||
|
int trys = 0;
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
|
if (trys >= retrys)
|
||||||
|
{
|
||||||
|
fail("Thumbnail never gets created " + thumbnailName);
|
||||||
|
}
|
||||||
|
|
||||||
MockHttpServletResponse response = getRequest(url, 0);
|
MockHttpServletResponse response = getRequest(url, 0);
|
||||||
if (response.getStatus() == 200)
|
if (response.getStatus() == 200)
|
||||||
{
|
{
|
||||||
@@ -189,6 +195,8 @@ public class ThumbnailServiceTest extends BaseWebScriptTest
|
|||||||
{
|
{
|
||||||
Thread.sleep(100);
|
Thread.sleep(100);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
trys++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user