Merged 5.2.N (5.2.1) to HEAD (5.2)

125448 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125339 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125269 amukha: MNT-15976: A few Oracle tests sometimes take hours to complete
            - disabled long running tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 16:10:38 +00:00
parent bad97eaba7
commit 110e506417
2 changed files with 7 additions and 3 deletions

View File

@@ -298,9 +298,12 @@ public class MultiTDemoTest extends TestCase
}, tenantAdminName, tenantDomain);
}
}
/**
* The test is ignored, see MNT-15976
*/
// note: needs to come before test10CreateCategories & test15COCIandSearch ?
public synchronized void test00_ALF_17681() throws Exception
public synchronized void ignoreTest00_ALF_17681() throws Exception
{
// The issue was found on Lucene
final String tenantDomain = TEST_RUN+".alf17681";