[jbosstools-commits] JBoss Tools SVN: r43003 - in trunk: bpel/tests/org.jboss.tools.bpel.ui.bot.test and 19 other directories.

Author: mickael_istria Date: 2012-08-13 13:21:34 -0400 (Mon, 13 Aug 2012) New Revision: 43003 Modified: trunk/bpel/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml trunk/build/parent/pom.xml trunk/build/tycho-plugins/repository-utils/ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/pom.xml trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml trunk/common/ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml trunk/jbpm/ trunk/jsf/tests/pom.xml trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/pom.xml trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml trunk/seam/tests/pom.xml trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml trunk/vpe/tests/pom.xml trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml Log: JBIDE-12422: Use surefire.timeout to configure timeout rather than hardcoding a forkedProcessTimeout value Property changes on: trunk/bpel ___________________________________________________________________ Added: svn:ignore + target Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -16,6 +16,7 @@ <coverage.filter>org.jboss.tools.bpel.runtimes*</coverage.filter> <emma.instrument.bundles>org.jboss.tools.bpel.runtimes</emma.instrument.bundles> <systemProperties>-Dswtbot.test.properties.file=./org.jboss.tools.bpel.ui.bot.test.properties</systemProperties> + <surefire.timeout>10800</surefire.timeout> </properties> <build> @@ -113,7 +114,6 @@ <testClass>org.jboss.tools.bpel.ui.bot.test.suite.BPELAllTest</testClass> <useUIThread>false</useUIThread> <skip>${swtbot.test.skip}</skip> - <forkedProcessTimeoutInSeconds>10800</forkedProcessTimeoutInSeconds> <dependencies combine.children="append"> <!-- BPEL feature --> <dependency> Modified: trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml =================================================================== --- trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -13,6 +13,7 @@ <packaging>eclipse-test-plugin</packaging> <properties> <systemProperties>-Dswtbot.test.skip=false -Dtest.configurations.dir=resources/</systemProperties> + <surefire.timeout>3600</surefire.timeout> </properties> <build> <plugins> @@ -24,7 +25,6 @@ <useUIThread>false</useUIThread> <testSuite>org.jboss.tools.drools.ui.bot.test</testSuite> <testClass>org.jboss.tools.drools.ui.bot.test.DroolsAllBotTests</testClass> - <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> <dependencies combine.children="append"> <dependency> <type>p2-installable-unit</type> Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/build/parent/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -72,7 +72,9 @@ <!-- 5. extra requirements (for 3rd party "Extras" site) --> <jboss-requirements-composite-extras-mirror>http://download.jboss.org/j... - + + <!-- Tests Timeout in seconds --> + <surefire.timeout>2400</surefire.timeout> <!-- Default coverage filter, to be overriden when necessary --> <coverage.filter>org.jboss.tools.*</coverage.filter> @@ -173,9 +175,6 @@ <artifactId>tycho-surefire-plugin</artifactId> <version>${tychoVersion}</version> <configuration> - <!-- timeout in seconds --> - <surefire.timeout>2400</surefire.timeout> - <forkedProcessTimeoutInSeconds>2400</forkedProcessTimeoutInSeconds> <useUIHarness>true</useUIHarness> <useUIThread>true</useUIThread> <!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING --> Property changes on: trunk/build/tycho-plugins/repository-utils ___________________________________________________________________ Added: svn:ignore + target Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -13,6 +13,7 @@ <properties> <additionalSystemProperties></additionalSystemProperties> <systemProperties>${additionalSystemProperties} -Dswtbot.test.properties.file=${project.basedir}/properties/swtbot.properties</systemProperties> + <surefire.timeout>10800</surefire.timeout> </properties> <build> @@ -51,7 +52,6 @@ <useUIThread>false</useUIThread> <skip>${swtbot.test.skip}</skip> <!-- Kill swt bot test take more than 3 hours minutes (10800 seconds) to finish --> - <forkedProcessTimeoutInSeconds>10800</forkedProcessTimeoutInSeconds> <dependencies combine.children="append"> <dependency> <type>p2-installable-unit</type> Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/pom.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -13,6 +13,7 @@ <properties> <additionalSystemProperties></additionalSystemProperties> <systemProperties>${additionalSystemProperties} -Dswtbot.test.properties.file=${project.basedir}/properties/swtbot.properties</systemProperties> + <surefire.timeout>10800</surefire.timeout> </properties> <profiles> <profile> @@ -57,8 +58,6 @@ <testClass>org.jboss.tools.cdi.seam3.bot.test.CDISeam3AllBotTests</testClass> <useUIThread>false</useUIThread> <skip>${swtbot.test.skip}</skip> - <!-- Kill swt bot test take more than 3 hours minutes (10800 seconds) to finish --> - <forkedProcessTimeoutInSeconds>10800</forkedProcessTimeoutInSeconds> <dependencies combine.children="append"> <dependency> <type>p2-installable-unit</type> Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -17,6 +17,7 @@ <jbosstools.test.jbossas.home>${requirementsDirectory}/jboss-as-7.1.1.Final</jbosstools.test.jbossas.home> <!-- for debugging ucomment and comment next line <systemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y -Djbosstools.test.jbossas.home=${jbosstools.test.jbossas.home} -Dswtbot.test.properties.file=${swtbot.properties}</systemProperties> --> <systemProperties>${additionalSystemProperties} -Djbosstools.test.jbossas.home=${jbosstools.test.jbossas.home} -Dtest.configurations.dir=${test.configurations.dir} -Deap.maven.config.file=${eap.maven.config.file}</systemProperties> + <surefire.timeout>10800</surefire.timeout> </properties> <profiles> @@ -63,7 +64,6 @@ <testClass>org.jboss.tools.central.test.ui.bot.CentralAllBotTests</testClass> <useUIThread>false</useUIThread> <skip>${swtbot.test.skip}</skip> - <forkedProcessTimeoutInSeconds>10800</forkedProcessTimeoutInSeconds> <dependencies combine.children="append"> <dependency> <type>p2-installable-unit</type> Property changes on: trunk/common ___________________________________________________________________ Modified: svn:ignore - test + test target Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -15,8 +15,8 @@ <jbosstools.test.jbossesb.home>${requirementsDirectory}/jbossesb-4.11</jbosstools.test.jbossesb.home> <jbosstools.test.jbosssoa.home>${requirementsDirectory}/jboss-soa-p-5.3/jboss-soa-p-5/jboss-as</jbosstools.test.jbosssoa.home> <swtbot.test.properties.file>./org.jboss.tools.esb.ui.bot.test.properties</swtbot.test.properties.file> - <systemProperties>-Djbosstools.test.jbossesb.home=${jbosstools.test.jbossesb.home} -Djbosstools.test.jbosssoa.home=${jbosstools.test.jbosssoa.home} -Dswtbot.test.properties.file=${swtbot.test.properties.file} - </systemProperties> + <systemProperties>-Djbosstools.test.jbossesb.home=${jbosstools.test.jbossesb.home} -Djbosstools.test.jbosssoa.home=${jbosstools.test.jbosssoa.home} -Dswtbot.test.properties.file=${swtbot.test.properties.file}</systemProperties> + <surefire.timeout>7200</surefire.timeout> </properties> <build> @@ -59,7 +59,6 @@ <skip>${swtbot.test.skip}</skip> <testSuite>org.jboss.tools.esb.ui.bot.test</testSuite> <testClass>org.jboss.tools.esb.ui.bot.tests.ESBAllBotTests</testClass> - <forkedProcessTimeoutInSeconds>7200</forkedProcessTimeoutInSeconds> </configuration> </plugin> </plugins> Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -14,6 +14,7 @@ <properties> <coverage.filter>org.hibernate.eclipse*</coverage.filter> <emma.instrument.bundles>org.hibernate.eclipse.console</emma.instrument.bundles> + <surefire.timeout>3600</surefire.timeout> </properties> <build> @@ -27,9 +28,6 @@ <bundle>org.hibernate.eclipse</bundle> <bundle>org.hibernate.eclipse.libs</bundle> </explodedBundles> - <!-- timeout in seconds; default 1800 --> - <surefire.timeout>3600</surefire.timeout> - <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> </configuration> </plugin> </plugins> Property changes on: trunk/jbpm ___________________________________________________________________ Added: svn:ignore + target Modified: trunk/jsf/tests/pom.xml =================================================================== --- trunk/jsf/tests/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/jsf/tests/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -11,6 +11,10 @@ <name>jsf.tests</name> <packaging>pom</packaging> + + <properties> + <surefire.timeout>3600</surefire.timeout> + </properties> <profiles> <profile> @@ -70,10 +74,6 @@ <artifactId>tycho-surefire-plugin</artifactId> <configuration> <product>org.jboss.tools.tests.product</product> - <!-- default is 1800 sec = 30 min --> - <surefire.timeout>3600</surefire.timeout> - <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> - <explodedBundles> <bundle>org.jboss.tools.vpe</bundle> <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle> Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/pom.xml =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -16,6 +16,7 @@ <properties> <systemProperties>-Dtest.configurations.dir=${configurations.dir}</systemProperties> + <surefire.timeout>10800</surefire.timeout> </properties> <build> @@ -24,8 +25,6 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> <configuration> - <!-- Kill swt bot test take more than 3 hours minutes (10800 seconds) to finish --> - <forkedProcessTimeoutInSeconds>10800</forkedProcessTimeoutInSeconds> <skip>${swtbot.test.skip}</skip> <useUIThread>false</useUIThread> <testSuite>org.jboss.tools.openshift.ui.bot.test</testSuite> Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -22,6 +22,7 @@ <additionalSystemProperties></additionalSystemProperties> <systemProperties>${additionalSystemProperties} -Djbosstools.test.jboss-gatein.home=${jbosstools.test.jboss-gatein.home} -Djbosstools.test.jboss-seam-2.2.home=${jbosstools.test.jboss-seam-2.2.home} -Djbosstools.test.jboss-portal.home=${jbosstools.test.jboss-portal.home} -Djbosstools.test.jboss-seam-2.0.home=${jbosstools.test.jboss-seam-2.0.home} -Djbosstools.test.jboss-portlet-bridge.home=${jbosstools.test.jboss-portlet-bridge.home} -Dtest.configurations.dir=${configurations.dir} -Dorg.eclipse.swtbot.screenshots.dir=${project.build.directory}/screenshots</systemProperties> <test.class>org.jboss.tools.portlet.ui.bot.test.AllTestsSuite</test.class> + <surefire.timeout>7200</surefire.timeout> </properties> <profiles> @@ -107,8 +108,6 @@ <artifactId>tycho-surefire-plugin</artifactId> <configuration> <useUIThread>false</useUIThread> - <surefire.timeout>7200</surefire.timeout> - <forkedProcessTimeoutInSeconds>7200</forkedProcessTimeoutInSeconds> <testSuite>org.jboss.tools.portlet.ui.bot.test</testSuite> <testClass>${test.class}</testClass> <skip>${swtbot.test.skip}</skip> Modified: trunk/seam/tests/pom.xml =================================================================== --- trunk/seam/tests/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/seam/tests/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -46,6 +46,10 @@ <module>org.jboss.tools.seamfp.core.test</module> <module>org.jboss.tools.seamfp.ui.test</module> </modules> + + <properties> + <surefire.timeout>1800</surefire.timeout> + </properties> <build> <plugins> <plugin> @@ -53,10 +57,6 @@ <artifactId>tycho-surefire-plugin</artifactId> <configuration> <product>org.jboss.tools.tests.product</product> - <!-- default is 1800 sec = 30 min --> - <surefire.timeout>1800</surefire.timeout> - <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds> - <explodedBundles> <bundle>org.jboss.tools.vpe</bundle> <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle> Modified: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml =================================================================== --- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -13,6 +13,7 @@ <properties> <coverage.filter>org.jboss.tools*</coverage.filter> <emma.instrument.bundles>org.jboss.tools.struts,org.jboss.tools.struts.text.ext,org.jboss.tools.struts.vpe.struts</emma.instrument.bundles> + <surefire.timeout>3600</surefire.timeout> </properties> <build> <plugins> @@ -20,9 +21,6 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> <configuration> - <!-- timeout in seconds (60 mins) --> - <surefire.timeout>3600</surefire.timeout> - <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> <product>org.jboss.tools.tests</product> <explodedBundles> <bundle>org.jboss.tools.vpe</bundle> Modified: trunk/vpe/tests/pom.xml =================================================================== --- trunk/vpe/tests/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/vpe/tests/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -59,6 +59,10 @@ </profile> </profiles> + <properties> + <surefire.timeout>3600</surefire.timeout> + </properties> + <build> <plugins> <plugin> @@ -66,9 +70,6 @@ <artifactId>tycho-surefire-plugin</artifactId> <configuration> <product>org.jboss.tools.tests.product</product> - <!-- default is 1800 sec = 30 min --> - <surefire.timeout>3600</surefire.timeout> - <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> <appArgLine>-debug -consolelog</appArgLine> <explodedBundles> <bundle>org.mozilla.xulrunner.cocoa.macosx</bundle> Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -16,6 +16,7 @@ <systemProperties>-Djbosstools.test.jre.6=${jbosstools.test.jre.6} -Djbosstools.test.jre.5=${jbosstools.test.jre.5} -Djbosstools.test.jboss.home.4.2=${requirementsDirectory}/jboss-4.2.3.GA</systemProperties> <coverage.filter>org.jboss.tools.ws.creation.core*</coverage.filter> <emma.instrument.bundles>org.jboss.tools.ws.creation.core</emma.instrument.bundles> + <surefire.timeout>3600</surefire.timeout> </properties> <build> @@ -53,16 +54,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - - <configuration> - <!-- timeout in seconds --> - <surefire.timeout>3600</surefire.timeout> - <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> - </configuration> - </plugin> </plugins> </build> Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -28,16 +28,6 @@ <target>1.6</target> </configuration> </plugin> - <!-- plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> - <configuration> <useUIHarness>false</useUIHarness> - <surefire.timeout>3600</surefire.timeout> <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> - <includes> <include>**/TestCase.class</include> <include>**/*TestSuite*.class</include> - </includes> </configuration> </plugin --> - <!--plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <executions> <execution> <id>test</id> <phase>test</phase> <configuration> - <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory> - </configuration> <goals> <goal>test</goal> </goals> </execution> </executions> - </plugin --> </plugins> </build> </project> Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2012-08-13 17:15:57 UTC (rev 43002) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2012-08-13 17:21:34 UTC (rev 43003) @@ -16,6 +16,7 @@ <properties> <additionalSystemProperties></additionalSystemProperties> <systemProperties>${additionalSystemProperties} -Dswtbot.test.properties.file=${project.basedir}/properties/swtbot.properties</systemProperties> + <surefire.timeout>10800</surefire.timeout> </properties> <profiles> <profile> @@ -60,9 +61,6 @@ <testClass>org.jboss.tools.ws.ui.bot.test.WSAllBotTests</testClass> <useUIThread>false</useUIThread> <skip>${swtbot.test.skip}</skip> - <!-- Kill swt bot test take more than 3 hours minutes (10800 seconds) - to finish --> - <forkedProcessTimeoutInSeconds>10800</forkedProcessTimeoutInSeconds> <dependencies combine.children="append"> <dependency> <type>p2-installable-unit</type>