Merged changes to 6.7

svn changeset:19972/svn branch:6.7

1 files changed, 12 insertions, 29 deletions

diff --git a/tests/test.xml b/tests/test.xml
index 512db895a9..7f6331ec8e 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -5,11 +5,14 @@
 	<!-- Configuration                                                      -->
 	<!-- ================================================================== -->
 	<!-- Browsers to use for testing -->
-	<property name="browsers-windows" value="winxp-ie6,winxp-ie7,winxp-ie8,win7-ie9,winxp-firefox36,winxp-firefox4,winxp-safari4,winxp-safari5,winxp-googlechrome-stable,winxp-opera1060,winxp-opera11" />
+	<property name="browsers-windows" value="winxp-ie6,winxp-ie7,winxp-ie8,win7-ie9,winxp-firefox36,winxp-firefox4,winxp-firefox5,winxp-safari4,winxp-safari5,winxp-googlechrome-stable,winxp-opera1060,winxp-opera11" />
 	<property name="browsers-linux" value="linux-firefox3,linux-opera10,linux-googlechrome8" />
 	<property name="browsers-mac" value="osx-firefox3,osx-opera10,osx-googlechrome8,osx-safari4,osx-safari5" />
 
 	<property name="browsers" value="${browsers-windows}" />
+	
+	<!-- Number of times to retry a test if it fails -->
+	<property name="retries" value="2" />
 
 	<!-- Screen shot base directory -->
 	<fail unless="com.vaadin.testbench.screenshot.directory" message="The 'com.vaadin.testbench.screenshot.directory' property must be defined." />
@@ -20,6 +23,9 @@
 	<!-- Host running Testbench Hub -->
 	<property name="com.vaadin.testbench.tester.host" value="testbench-hub.intra.itmill.com" />
 
+	<property name="com.vaadin.testbench.screenshot.block.error" value="0.025"/>
+	<property name="com.vaadin.testbench.debug" value="false"/>
+	
 	<!-- Temporary output directory, created and removed by this script -->
 	<!-- <property name="test-output-dir" value="../build/test-output" /> -->
 	<fail unless="test-output-dir" message="The 'test-output-dir' property must be defined." />
@@ -43,16 +49,12 @@
 		<exclude name="tests/integration-testscripts/**" />
 	</fileset>
 
-	<!-- fileset containing tests to retry -->
-	<fileset dir=".." id="html-retry-files-ie6">
-		<include name="tests/**/SubWindows**.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">
 		<pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
 
 		<java classname="com.vaadin.testbench.util.TestConverter" classpathref="classpath" fork="true">
+			<sysproperty key="com.vaadin.testbench.test.retries" value="${retries}" />
 			<jvmarg value="-Duser.language=en"/>
 			<jvmarg value="-Duser.country=US"/>
 			<arg value="${test-output-dir}" />
@@ -62,30 +64,8 @@
 	</target>
 
 
-	<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="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" 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}" />
-			<jvmarg value="-Duser.language=en"/>
-			<jvmarg value="-Duser.country=US"/>
-			<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, create-retry-tests">
+	<target name="compile-tests" depends="create-tests">
 		<mkdir dir="${class-dir}" />
 		<javac srcdir="${test-output-dir}" destdir="${class-dir}" debug="on" fork="yes" failonerror="false" encoding="UTF8">
 			<classpath>
@@ -183,6 +163,9 @@
 			<jvmarg value="-Dcom.vaadin.testbench.screenshot.directory=${com.vaadin.testbench.screenshot.directory}" />
 			<!-- Resolution for screenshots -->
 			<jvmarg value="-Dcom.vaadin.testbench.screenshot.resolution=${com.vaadin.testbench.screenshot.resolution}" />
+			<jvmarg value="-Dcom.vaadin.testbench.debug=${com.vaadin.testbench.debug}" />
+			<jvmarg value="-Dcom.vaadin.testbench.screenshot.block.error=${com.vaadin.testbench.screenshot.block.error}" />
+
 
 			<jvmarg value="-Djava.awt.headless=true" />