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

127601 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127330 amukha: RA-941: V1 REST API Tests: rationalise the test startup - eg. only create test data when needed ;-)
         - Added checks to defer test data creation until it is required.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127693 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 14:48:37 +00:00
parent eb8cf53b69
commit d812ec3601
7 changed files with 53 additions and 20 deletions

View File

@@ -1329,12 +1329,12 @@ public class RepoService
public void create()
{
if(!getId().equals(TenantService.DEFAULT_DOMAIN))
if(!getId().equals(TenantService.DEFAULT_DOMAIN) && !tenantAdminService.existsTenant(getId()))
{
tenantAdminService.createTenant(getId(), "admin".toCharArray());
numNetworks++;
log("Created network " + getId());
}
numNetworks++;
log("Created network " + getId());
}
public TestSite createSite(SiteVisibility siteVisibility)