Retry test ComboBoxLargeIcons.html on winxp-ie6 max 2 times if test fails on runtime

svn changeset:16589/svn branch:6.5

diff --git a/tests/test.xml b/tests/test.xml
index a503e2a90c45e9952451547453ea3fe0042378ce..00c270be91ceca2355ab926bf8b9ec25ce5d82fc 100644 (file)
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -18,7 +18,7 @@
        <property name="com.vaadin.testbench.screenshot.resolution" value="1500x850" />
 
        <!-- Host running Testbench Hub -->
-       <property name="com.vaadin.testbench.tester.host" value="192.168.1.48" />
+       <property name="com.vaadin.testbench.tester.host" value="testbench-hub.intra.itmill.com" />
 
        <!-- Temporary output directory, created and removed by this script -->
        <!-- <property name="test-output-dir" value="../build/test-output" /> -->
@@ -57,8 +57,33 @@
                </java>
        </target>
 
+       <target name="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" />
+               </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" />
+
+               <java classname="com.vaadin.testbench.util.TestConverter" classpathref="classpath">
+                       <sysproperty key="com.vaadin.testbench.test.retries" value="${retries}" />
+                       <arg value="${test-output-dir}" />
+                       <arg value="${browser}" />
+                       <arg line="${testfile}" />
+               </java>
+
+       </target>
+
        <!-- This target complies the generated java junit tests. -->
-       <target name="compile-tests" depends="create-tests">
+       <target name="compile-tests" depends="create-tests, create-retry-tests">
                <mkdir dir="${class-dir}" />
                <javac srcdir="${test-output-dir}" destdir="${class-dir}" debug="on" fork="yes" failonerror="false" encoding="UTF8">
                        <classpath>