Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

93378: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93342: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
      Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelDelete in case of MS SQl Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 12:22:10 +00:00
parent a1ca7da9e8
commit d40f2568b0

View File

@@ -624,6 +624,10 @@ public class RepoAdminServiceImplTest extends TestCase
}
public void testConcurrentDynamicModelDelete() throws Exception
{
// disable in case of SQL Server
// see MNT-13089
if (!(dialect instanceof SQLServerDialect))
{
final int n = 2;
@@ -658,6 +662,7 @@ public class RepoAdminServiceImplTest extends TestCase
assertEquals(dictModelCount, getModelCount());
}
}
private int getModelCount()
{