mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged DEV to HEAD
52182: MT: Remove some unused code and add @Override for DAO methods 52183: ALF-19172: Disable sys:undeletable aspect while deleting test's tenants 52274: Allow post-test tenant deletion by implementing hacks against ALF-19155 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@52284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1895,13 +1895,14 @@ public class DiscussionServiceImplTest
|
||||
public Void execute() throws Throwable
|
||||
{
|
||||
// TODO: WARNING: HACK for ALF-19155: MT deleteTenant does not work
|
||||
// MultiTNodeServiceInterceptor.exists does not work is tenant has been deleted.
|
||||
// beforeCommit code breaks on NodeService.exists calls
|
||||
// PersonService prevents 'guest' authorities from being deleted
|
||||
{
|
||||
return null;
|
||||
BehaviourFilter behaviourFilter = (BehaviourFilter) testContext.getBean("policyBehaviourFilter");
|
||||
behaviourFilter.disableBehaviour(ContentModel.TYPE_PERSON);
|
||||
behaviourFilter.disableBehaviour(ContentModel.ASPECT_UNDELETABLE);
|
||||
}
|
||||
// TENANT_ADMIN_SERVICE.deleteTenant(TENANT_DOMAIN);
|
||||
// return null;
|
||||
TENANT_ADMIN_SERVICE.deleteTenant(TENANT_DOMAIN);
|
||||
return null;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
Reference in New Issue
Block a user