diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-03-12 10:10:30 +0200 |
|---|---|---|
| committer | Sauli Tähkäpää <sauli@vaadin.com> | 2014-03-12 10:10:30 +0200 |
| commit | 97622fd7232a87a3ba37e6042177cf2d623cedbd (patch) | |
| tree | e5fbe77b52216d73bf232453539f1364d3d1f8f0 /uitest | |
| parent | 71e8c7efa9cef900b3307aab0d0fd4d9470810a2 (diff) | |
| download | vaadin-framework-97622fd7232a87a3ba37e6042177cf2d623cedbd.tar.gz vaadin-framework-97622fd7232a87a3ba37e6042177cf2d623cedbd.zip | |
Added server launch wait to TB2 and TB3 test targets.
Change-Id: Iaa9feeedd1a2dbc879617c7b0dfedfeff36a7ba5
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/build.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/uitest/build.xml b/uitest/build.xml index b9bb5a4cbd..8479063ba0 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -212,6 +212,7 @@ <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" /> </daemons> <sequential> + <ant antfile="${uitest.dir}/vaadin-server.xml" target="wait-for-startup" /> <ant antfile="${uitest.dir}/test.xml" target="tb2-tests" /> </sequential> </parallel> @@ -224,6 +225,7 @@ <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" /> </daemons> <sequential> + <ant antfile="${uitest.dir}/vaadin-server.xml" target="wait-for-startup" /> <ant antfile="${uitest.dir}/tb3test.xml" target="run-all-tb3-tests" inheritall="true" /> </sequential> </parallel> |