Skip to content

Commit

Permalink
Merge branch 'master' into issue-2525
Browse files Browse the repository at this point in the history 
* master:
  created profile for paralel testing to prevent errors running single test from IDEA
  • Loading branch information
Maria Farooq committed Oct 2, 2017
2 parents e8ae692 + b45a940 commit f4c830a
Showing 1 changed file with 106 additions and 95 deletions.
201 changes: 106 additions & 95 deletions restcomm/restcomm.testsuite/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,112 +423,123 @@
<resultFileMinClasspathCount>2</resultFileMinClasspathCount>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.18.1</version>
<configuration>
<includes>
<include>**/CallLifecycleAnswerDelayTest.java</include>
<include>**/CallLifecycleTest.java</include>
<include>**/CallRegexSingleTest.java</include>
<include>**/CallRegexTest.java</include>
<include>**/ClientsDialAnswerDelayTest.java</include>
<include>**/ClientsDialTest.java</include>
<include>**/DialActionAnswerDelayTest.java</include>
<include>**/DialActionTest.java</include>
<include>**/DialForkAnswerDealyTest.java</include>
<include>**/DialForkTest.java</include>
<include>**/DialRecordingAnswerDelayTest.java</include>
<include>**/DialRecordingTest.java</include>
<include>**/DialStatusCallbackTest.java</include>
<include>**/ImsClientsDialAnswerDelayTest.java</include>
<include>**/ImsClientsDialTest.java</include>
<include>**/TestDialVerbPartOneAnswerDelay.java</include>
<include>**/TestDialVerbPartOne.java</include>
<include>**/TestDialVerbPartTwoAnswerDelay.java</include>
<include>**/TestDialVerbPartTwo.java</include>
<include>**/TestDialVerbPartThreeAnswerDelay.java</include>
<include>**/TestDialVerbPartThree.java</include>

<include>**/UserAgentManagerTest.java</include>
<include>**/sms/*Test.java</include>
<include>**/connect/testsuite/*Test.java</include>
</includes>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<rerunFailingTestsCount>2</rerunFailingTestsCount>
<!-- let ci script set forkcount.Dont increase over 65
since that will make ports over the maximum allowed by OS.
on local env set depending on available mem
<forkCount>2</forkCount>
-->
<reuseForks>false</reuseForks>
<parallel>classes</parallel>
<threadCountClasses>5</threadCountClasses>
<!-- start with low memory to increase forks -->
<argLine>-Xms256m -Xmx2048m -XX:MaxPermSize=512m</argLine>
<systemPropertyVariables>
<!--use different arquillian configuration to tweak maps
depending on forked JVM-->
<arquillian.launch>mss-tomcat-embedded-7-forked</arquillian.launch>
<!-- this will ensure sip and http ports are diff for
every forked JVM/test class-->
<arquillian_http_port>${surefire.forkNumber}509</arquillian_http_port>
<arquillian_sip_port>${surefire.forkNumber}508</arquillian_sip_port>
</systemPropertyVariables>
</configuration>
<executions>
<execution>
<id>failsafe-integration-tests</id>
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<argLine>-Xms1024m -Xmx2048m -XX:MaxPermSize=1024m</argLine>
<!-- <excludes> <exclude>**/SmsSessionTest.java</exclude> </excludes> -->
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<skipTests>${skipUTs}</skipTests>
<excludes>
<exclude>**/CallLifecycleAnswerDelayTest.java</exclude>
<exclude>**/CallLifecycleTest.java</exclude>
<exclude>**/CallRegexSingleTest.java</exclude>
<exclude>**/CallRegexTest.java</exclude>
<exclude>**/ClientsDialAnswerDelayTest.java</exclude>
<exclude>**/ClientsDialTest.java</exclude>
<exclude>**/DialActionAnswerDelayTest.java</exclude>
<exclude>**/DialActionTest.java</exclude>
<exclude>**/DialForkAnswerDealyTest.java</exclude>
<exclude>**/DialForkTest.java</exclude>
<exclude>**/DialRecordingAnswerDelayTest.java</exclude>
<exclude>**/DialRecordingTest.java</exclude>
<exclude>**/DialStatusCallbackTest.java</exclude>
<exclude>**/ImsClientsDialAnswerDelayTest.java</exclude>
<exclude>**/ImsClientsDialTest.java</exclude>
<exclude>**/TestDialVerbPartOneAnswerDelay.java</exclude>
<exclude>**/TestDialVerbPartOne.java</exclude>
<exclude>**/TestDialVerbPartTwoAnswerDelay.java</exclude>
<exclude>**/TestDialVerbPartTwo.java</exclude>
<exclude>**/TestDialVerbPartThreeAnswerDelay.java</exclude>
<exclude>**/TestDialVerbPartThree.java</exclude>

<exclude>**/UserAgentManagerTest.java</exclude>
<exclude>**/sms/*Test.java</exclude>
<exclude>**/connect/testsuite/*Test.java</exclude>
</excludes>
</configuration>
</plugin>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>parallel-testing</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.18.1</version>
<configuration>
<includes>
<include>**/CallLifecycleAnswerDelayTest.java</include>
<include>**/CallLifecycleTest.java</include>
<include>**/CallRegexSingleTest.java</include>
<include>**/CallRegexTest.java</include>
<include>**/ClientsDialAnswerDelayTest.java</include>
<include>**/ClientsDialTest.java</include>
<include>**/DialActionAnswerDelayTest.java</include>
<include>**/DialActionTest.java</include>
<include>**/DialForkAnswerDealyTest.java</include>
<include>**/DialForkTest.java</include>
<include>**/DialRecordingAnswerDelayTest.java</include>
<include>**/DialRecordingTest.java</include>
<include>**/DialStatusCallbackTest.java</include>
<include>**/ImsClientsDialAnswerDelayTest.java</include>
<include>**/ImsClientsDialTest.java</include>
<include>**/TestDialVerbPartOneAnswerDelay.java</include>
<include>**/TestDialVerbPartOne.java</include>
<include>**/TestDialVerbPartTwoAnswerDelay.java</include>
<include>**/TestDialVerbPartTwo.java</include>
<include>**/TestDialVerbPartThreeAnswerDelay.java</include>
<include>**/TestDialVerbPartThree.java</include>

<include>**/UserAgentManagerTest.java</include>
<include>**/sms/*Test.java</include>
<include>**/connect/testsuite/*Test.java</include>
</includes>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<rerunFailingTestsCount>2</rerunFailingTestsCount>
<!-- let ci script set forkcount.Dont increase over 65
since that will make ports over the maximum allowed by OS.
on local env set depending on available mem
<forkCount>2</forkCount>
-->
<reuseForks>false</reuseForks>
<parallel>classes</parallel>
<threadCountClasses>5</threadCountClasses>
<!-- start with low memory to increase forks -->
<argLine>-Xms256m -Xmx2048m -XX:MaxPermSize=512m</argLine>

</configuration>
<executions>
<execution>
<id>failsafe-integration-tests</id>
<phase>integration-test</phase>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<argLine>-Xms1024m -Xmx2048m -XX:MaxPermSize=1024m</argLine>
<!-- <excludes> <exclude>**/SmsSessionTest.java</exclude> </excludes> -->
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<skipTests>${skipUTs}</skipTests>
<excludes>
<exclude>**/CallLifecycleAnswerDelayTest.java</exclude>
<exclude>**/CallLifecycleTest.java</exclude>
<exclude>**/CallRegexSingleTest.java</exclude>
<exclude>**/CallRegexTest.java</exclude>
<exclude>**/ClientsDialAnswerDelayTest.java</exclude>
<exclude>**/ClientsDialTest.java</exclude>
<exclude>**/DialActionAnswerDelayTest.java</exclude>
<exclude>**/DialActionTest.java</exclude>
<exclude>**/DialForkAnswerDealyTest.java</exclude>
<exclude>**/DialForkTest.java</exclude>
<exclude>**/DialRecordingAnswerDelayTest.java</exclude>
<exclude>**/DialRecordingTest.java</exclude>
<exclude>**/DialStatusCallbackTest.java</exclude>
<exclude>**/ImsClientsDialAnswerDelayTest.java</exclude>
<exclude>**/ImsClientsDialTest.java</exclude>
<exclude>**/TestDialVerbPartOneAnswerDelay.java</exclude>
<exclude>**/TestDialVerbPartOne.java</exclude>
<exclude>**/TestDialVerbPartTwoAnswerDelay.java</exclude>
<exclude>**/TestDialVerbPartTwo.java</exclude>
<exclude>**/TestDialVerbPartThreeAnswerDelay.java</exclude>
<exclude>**/TestDialVerbPartThree.java</exclude>

<exclude>**/UserAgentManagerTest.java</exclude>
<exclude>**/sms/*Test.java</exclude>
<exclude>**/connect/testsuite/*Test.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<repositories>
<repository>
Expand Down

0 comments on commit f4c830a

Please sign in to comment.