From aad85cd6f95262262be524907fe98f7d306d3d15 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 31 Jan 2015 15:29:30 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 93993: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud) 93950: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server Disabled MultiTServiceImplTest.testGetName in case of MS SQL Server. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95031 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/tenant/MultiTServiceImplTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/test-java/org/alfresco/repo/tenant/MultiTServiceImplTest.java b/source/test-java/org/alfresco/repo/tenant/MultiTServiceImplTest.java index 64deca508b..3a3aeec831 100644 --- a/source/test-java/org/alfresco/repo/tenant/MultiTServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/tenant/MultiTServiceImplTest.java @@ -194,6 +194,12 @@ public class MultiTServiceImplTest @Test public void testGetName() { + // disable in case of SQL Server + // see MNT-13089 + if (dialect instanceof SQLServerDialect) + { + return; + } NodeRef userNodeRef = createUser(USER1, TenantService.DEFAULT_DOMAIN, PASS); assertNotNull("The user was not created.", userNodeRef); TenantRunAsWork work1 = new TenantRunAsWork()