summaryrefslogtreecommitdiffstats
path: root/tests/integration_tests.xml
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2012-01-19 19:51:19 +0000
committerArtur Signell <artur.signell@itmill.com>2012-01-19 19:51:19 +0000
commitab6a049e2fe7747d99c6017941cebaec54848cfe (patch)
tree04ad5b177e63c237316db81b76a217e5ef96bedf /tests/integration_tests.xml
parent6abe5920cc4baeb2060ab89df31d2c0c8ece274e (diff)
downloadvaadin-framework-ab6a049e2fe7747d99c6017941cebaec54848cfe.tar.gz
vaadin-framework-ab6a049e2fe7747d99c6017941cebaec54848cfe.zip
Attempt at evening the load of the integration tests by starting all lightweight servers immediately and the more heavy servers later on
svn changeset:22720/svn branch:6.7
Diffstat (limited to 'tests/integration_tests.xml')
-rw-r--r--tests/integration_tests.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 14fa836a52..0c62d560c3 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -139,14 +139,13 @@
<param name="target-server" value="jetty7" />
</antcall>
</target>
-
+
<target name="integration-test-jetty8">
<antcall target="run-generic-integration-test">
- <param name="startDelay" value="300" />
<param name="target-server" value="jetty8" />
</antcall>
</target>
-
+
<target name="integration-test-jboss3">
<antcall target="run-generic-integration-test">
<param name="startDelay" value="10" />
@@ -269,15 +268,16 @@
<param name="target-server" value="weblogic10" />
</antcall>
</target>
-
+
<target name="integration-test-weblogic12">
<antcall target="run-generic-integration-test">
+ <param name="startDelay" value="600" />
<param name="target-port" value="7001" />
<param name="target-server" value="weblogic12" />
</antcall>
</target>
-
-
+
+
<target name="integration-test-weblogicPortal">
<fileset dir="integration-testscripts" id="html-test-files" includes="weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html" />
<pathconvert pathsep=" " property="testfiles" refid="html-test-files" />