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

58638: BDE-243 Use testFailureIgnore to keep on executing test even if first batch contains error + tidy surefire config a bit


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62009 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 23:51:39 +00:00
parent 11012106dd
commit ebb8773e00

21
pom.xml
View File

@@ -883,12 +883,8 @@
<goal>test</goal> <goal>test</goal>
</goals> </goals>
<configuration> <configuration>
<!-- These are the default fork options -->
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<!-- end of default fork options -->
<groups>org.alfresco.test_category.BaseSpringTestsCategory</groups> <groups>org.alfresco.test_category.BaseSpringTestsCategory</groups>
<excludedGroups>org.alfresco.test_category.OwnJVMTestsCategory</excludedGroups> <testFailureIgnore>true</testFailureIgnore>
</configuration> </configuration>
</execution> </execution>
<!-- Execution for tests which require their own JVM --> <!-- Execution for tests which require their own JVM -->
@@ -899,18 +895,17 @@
</goals> </goals>
<phase>process-test-classes</phase> <phase>process-test-classes</phase>
<configuration> <configuration>
<argLine>-Xmx2560m -XX:MaxPermSize=512m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
<!-- Equivalent of forkMode="always" -->
<forkCount>1</forkCount>
<reuseForks>false</reuseForks> <reuseForks>false</reuseForks>
<!-- end of fork options -->
<groups>org.alfresco.test_category.OwnJVMTestsCategory</groups> <groups>org.alfresco.test_category.OwnJVMTestsCategory</groups>
<testFailureIgnore>true</testFailureIgnore>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>default-test</id> <id>default-test</id>
<configuration> <configuration>
<argLine>-Xmx2560m -XX:MaxPermSize=512m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
<excludedGroups>org.alfresco.test_category.OwnJVMTestsCategory, org.alfresco.test_category.BaseSpringTestsCategory,org.alfresco.test_category.LegacyCategory</excludedGroups> <excludedGroups>org.alfresco.test_category.OwnJVMTestsCategory, org.alfresco.test_category.BaseSpringTestsCategory,org.alfresco.test_category.LegacyCategory</excludedGroups>
<testFailureIgnore>true</testFailureIgnore>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
@@ -919,20 +914,13 @@
<goal>test</goal> <goal>test</goal>
</goals> </goals>
<configuration> <configuration>
<argLine>-Xmx2560m -XX:MaxPermSize=512m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
<!-- These are the default fork options -->
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<!-- end of default fork options -->
<groups>org.alfresco.test_category.LegacyCategory</groups> <groups>org.alfresco.test_category.LegacyCategory</groups>
<excludedGroups>org.alfresco.test_category.OwnJVMTestsCategory,org.alfresco.test_category.BaseSpringTestsCategory</excludedGroups>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
<!-- Default configuration, specifying which tests to pass --> <!-- Default configuration, specifying which tests to pass -->
<configuration> <configuration>
<argLine>-Xmx2560m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
<failIfNoSpecifiedTests>false</failIfNoSpecifiedTests> <failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
<includes> <includes>
<!-- Standard test names --> <!-- Standard test names -->
@@ -944,7 +932,6 @@
</includes> </includes>
<excludes> <excludes>
<exclude>**/org/alfresco/RepositoryStartupTest.*</exclude> <exclude>**/org/alfresco/RepositoryStartupTest.*</exclude>
<!-- Failing tests which are not run with Ant - OK to exclude --> <!-- Failing tests which are not run with Ant - OK to exclude -->
<exclude>**/org/alfresco/encryption/EncryptionTests.*</exclude> <exclude>**/org/alfresco/encryption/EncryptionTests.*</exclude>
<exclude>**/org/alfresco/jcr/test/BaseJCRTest.*</exclude> <exclude>**/org/alfresco/jcr/test/BaseJCRTest.*</exclude>