Pass deps.initialized to called test targets in different build files.

diff --git a/build/build.xml b/build/build.xml
index 29a39ce8969fb67835055ee450e18c683328ae49..7453d55a5cac500bc4ab44a9294bf2066a22ad19 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -975,6 +975,8 @@
             <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}"/>
             <property name="com.vaadin.testbench.debug" value="${com.vaadin.testbench.debug}"/>
             <property name="com.vaadin.testbench.screenshot.block.error" value="${com.vaadin.testbench.screenshot.block.error}"/>
+               
+               <property name="deps.initialized"  value="${deps.initialized}"/>
                        
         </ant>
        
@@ -1013,6 +1015,8 @@
               <property name="sshkey.file" value="${sshkey.file}" />
               <property name="passphrase" value="${passphrase}" />
               <property name="demo.war" value="${tests.war}"/>
+               
+              <property name="deps.initialized"  value="${deps.initialized}"/>
         </ant>
     </target>
 </project>

diff --git a/tests/test.xml b/tests/test.xml
index 5ea9547fa4c277b07807e0315135a7e94853774e..6b5e27bebf9f7ab08b89e8495447fec61092ea6a 100644 (file)
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -5,8 +5,6 @@
        
        <!-- Import common targets  -->
        <import file="../build/common.xml" />
-       <!-- Import targets for server management  -->
-       <import file="vaadin-server.xml" as="server"/>
        
        <!-- ================================================================== -->
        <!-- Configuration                                                      -->
@@ -56,7 +54,7 @@
        </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">
+       <target name="create-tests" depends="initialize, remove-temp-testclasses">
                <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
 
                <java classname="com.vaadin.testbench.util.TestConverter" classpathref="classpath" fork="true">
@@ -174,7 +172,7 @@
                        <ant antfile="vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" />
                </daemons>
                <sequential>                            
-                       <antcall target="server.wait-for-startup" />
+                       <ant antfile="vaadin-server.xml" target="wait-for-startup" />
                    <antcall inheritall="true" inheritrefs="true" target="run-and-clean-up" />
                        <move file="${testing.testarea}/${package.name}/war.ec" todir="../build/result" failonerror="false" />
             </sequential>

diff --git a/tests/vaadin-server.xml b/tests/vaadin-server.xml
index 99117238ea6e5be9a66de822f95bb359d8418d3b..d4d23581ec6da2584ce8b8a61670e5ec679e5c24 100644 (file)
--- a/tests/vaadin-server.xml
+++ b/tests/vaadin-server.xml
@@ -46,7 +46,7 @@
     
     <target name="wait-for-startup">
         <echo>Waiting for Servlet Container to start up.</echo>
-        <waitfor maxwait="30" maxwaitunit="second" checkevery="3" checkeveryunit="second" timeoutproperty="server.start.failed">
+        <waitfor maxwait="60" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="server.start.failed">
             <http url="http://localhost:8888"/>
         </waitfor>
         <fail if="server.start.failed" message="Server startup failed" />