diff --git a/src/test/java/org/alfresco/MiscContextTestSuite.java b/src/test/java/org/alfresco/MiscContextTestSuite.java index 1ef965210a..306c42753b 100644 --- a/src/test/java/org/alfresco/MiscContextTestSuite.java +++ b/src/test/java/org/alfresco/MiscContextTestSuite.java @@ -97,7 +97,6 @@ import org.springframework.context.ApplicationContext; // [classpath*:alfresco/ibatis/ibatis-test-context.xml, classpath:alfresco/application-context.xml, // classpath:alfresco/test/global-integration-test-context.xml] org.alfresco.repo.domain.query.CannedQueryDAOTest.class, - // REPO-2783 only passes on a dirty DB. fails to pass on a clean DB - testConcurrentArchive org.alfresco.repo.node.NodeServiceTest.class, // [classpath:alfresco/application-context.xml, classpath:alfresco/minimal-context.xml] diff --git a/src/test/java/org/alfresco/repo/node/NodeServiceTest.java b/src/test/java/org/alfresco/repo/node/NodeServiceTest.java index 9b65e0b9ce..591f8b11b6 100644 --- a/src/test/java/org/alfresco/repo/node/NodeServiceTest.java +++ b/src/test/java/org/alfresco/repo/node/NodeServiceTest.java @@ -113,6 +113,7 @@ import org.springframework.extensions.surf.util.I18NUtil; * @author Derek Hulley * @since 4.0 */ + @Category(OwnJVMTestsCategory.class) public class NodeServiceTest { @@ -391,10 +392,9 @@ public class NodeServiceTest *

* See: ALF-5714
* See: ALF-16888 + * See: REPO-2783 *

* Note: if this test hangs for MySQL then check if 'innodb_locks_unsafe_for_binlog = true' (and restart MySQL + test) - * - * TODO add @Test marker back to the test after REPO-2783 is fixed */ public void testConcurrentArchive() throws Exception { @@ -404,11 +404,11 @@ public class NodeServiceTest // See ALF-16888. DB2 fails this test persistently. return; } - + final NodeRef workspaceRootNodeRef = nodeService.getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE); - final NodeRef[] nodesPrimer = new NodeRef[1]; + final NodeRef[] nodesPrimer = new NodeRef[2]; buildNodeHierarchy(workspaceRootNodeRef, nodesPrimer); - final NodeRef[] nodesOne = new NodeRef[10]; + final NodeRef[] nodesOne = new NodeRef[15]; buildNodeHierarchy(workspaceRootNodeRef, nodesOne); final NodeRef[] nodesTwo = new NodeRef[10]; buildNodeHierarchy(workspaceRootNodeRef, nodesTwo);