Retry tests only run if create.retry.tests and retries are given

svn changeset:16597/svn branch:6.5

diff --git a/build/build.xml b/build/build.xml
index 5cf1280223bf7cde53e9d5e179594184dd67cc74..5e168ff51e9ec34bdb297501cb8c657b08e76ba1 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -1188,6 +1188,10 @@
             <!-- "tests" classes after unpacking the package.          -->
             <property name="output-dir" value="${output-dir}"/>
 
+               <!-- Convert some tests to run multiple times if failed. -->
+            <property name="create.retry.tests" value="1"/>
+               <property name="retries" value="3"/>
+               
             <property name="package.filename" value="${package.filename}"/>
             <property name="testing.testarea" value="/tmp/testarea"/>
             <property name="package.name" value="${package.name}"/>

diff --git a/tests/test.xml b/tests/test.xml
index 00c270be91ceca2355ab926bf8b9ec25ce5d82fc..0711bf5410a0096eb8fd92afc1dee541c5bb65ab 100644 (file)
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -43,11 +43,13 @@
                <exclude name="tests/integration-testscripts/**" />
        </fileset>
 
+       <!-- fileset containing tests to retry -->
+       <fileset dir=".." id="html-retry-files-ie6">
+               <include name="tests/**/ComboBoxLargeIcons.html" />
+       </fileset>
+
        <!-- This target converts HTML tests files to java junit tests. One test file for each browser is created. -->
        <target name="create-tests" depends="remove-temp-testclasses" if="server.start.succeeded">
-               <fileset id="tests">
-                       <include />
-               </fileset>
                <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
 
                <java classname="com.vaadin.testbench.util.TestConverter" classpathref="classpath">
@@ -57,21 +59,17 @@
                </java>
        </target>
 
-       <target name="create-retry-tests">
+
+       <target name="create-retry-tests" if="create.retry.tests">
                <antcall target="convert-retry-test">
                        <param name="browser" value="winxp-ie6" />
-                       <param name="testfile-name" value="tests/**/ComboBoxLargeIcons.html" />
-                       <param name="retries" value="3" />
+                       <param name="testfile-name" value="html-retry-files-ie6" />
                </antcall>
        </target>
-       
+
        <!-- Target converts test files so that the whole test can be re run 'retries' times -->
-       <target name="convert-retry-test">
-               <fail unless="retries" message="The 'retries' property must be defined." />
-               <fileset dir=".." id="test-files">
-                       <include name="${testfile-name}" />
-               </fileset>
-               <pathconvert pathsep=" " property="testfile" refid="test-files" />
+       <target name="convert-retry-test" if="retries">
+               <pathconvert pathsep=" " property="testfile" refid="${testfile-name}" />
 
                <java classname="com.vaadin.testbench.util.TestConverter" classpathref="classpath">
                        <sysproperty key="com.vaadin.testbench.test.retries" value="${retries}" />
@@ -212,4 +210,4 @@
        <target name="test-package" depends="server-start, run-and-clean-up, server-stop">
        </target>
 
-</project>
+</project>
\ No newline at end of file