From 6e58fb9de077f5f0f6bde3790ec6659069034e10 Mon Sep 17 00:00:00 2001 From: Andrew Hind Date: Fri, 24 Feb 2012 20:22:56 +0000 Subject: [PATCH] Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD 34221: Test Fix: Avoid humerous deadlock with SQL Server - causing deadlock on dictionary initialisation from timestamp propagation - test hangs - may be a build fix .... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/admin/RepoAdminServiceImplTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java b/source/java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java index e5964874ac..627da56016 100644 --- a/source/java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java +++ b/source/java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java @@ -33,6 +33,7 @@ import junit.framework.TestCase; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; import org.alfresco.repo.content.MimetypeMap; +import org.alfresco.repo.node.db.DbNodeServiceImpl; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.service.cmr.admin.RepoAdminService; @@ -121,6 +122,9 @@ public class RepoAdminServiceImplTest extends TestCase searchService = (SearchService) ctx.getBean("SearchService"); namespaceService = (NamespaceService) ctx.getBean("NamespaceService"); + DbNodeServiceImpl dbNodeService = (DbNodeServiceImpl)ctx.getBean("dbNodeService"); + dbNodeService.setEnableTimestampPropagation(false); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); }