aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2012-01-27 08:17:27 +0000
committerArtur Signell <artur.signell@itmill.com>2012-01-27 08:17:27 +0000
commit94dddf055a57b344d326c7c1e04a982862ce4382 (patch)
tree6eb8e523a5bac7e2efe1a734115db300ef166969
parent31f14a53c620a2fbeaa0c46b4ffb033fe36b0e13 (diff)
downloadvaadin-framework-94dddf055a57b344d326c7c1e04a982862ce4382.tar.gz
vaadin-framework-94dddf055a57b344d326c7c1e04a982862ce4382.zip
[merge from 6.7] Attempt at evening the load of the integration tests by starting all lightweight servers immediately and the more heavy servers later on
svn changeset:22779/svn branch:6.8
-rw-r--r--tests/integration_tests.xml8
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 26dedcce9d..946dbc53fd 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -142,17 +142,11 @@
<target name="integration-test-jetty8">
<antcall target="run-generic-integration-test">
- <param name="target-server" value="jetty8" />
- </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" />