diff options
| author | Artur Signell <artur@vaadin.com> | 2011-11-11 10:50:14 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2011-11-11 10:50:14 +0200 |
| commit | c13992f13ff1cc335d0b11e2dcabb00592217c77 (patch) | |
| tree | b87355be13f458ec341c6da0cbd8abc6dc8f1af6 /tests | |
| parent | 472a17767e88b72b39d82b6827887f2665ca5c3c (diff) | |
| parent | ffa0e5302a53dea14023c16f0cc95665f8a7ed44 (diff) | |
| download | vaadin-framework-c13992f13ff1cc335d0b11e2dcabb00592217c77.tar.gz vaadin-framework-c13992f13ff1cc335d0b11e2dcabb00592217c77.zip | |
Merge branch 'master' of ssh://git@dev.vaadin.com/vaadin
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/integration-testscripts/common/integration_test.tpl | 2 | ||||
| -rw-r--r-- | tests/integration_tests.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/integration-testscripts/common/integration_test.tpl b/tests/integration-testscripts/common/integration_test.tpl index 4275d3fab0..ed97710282 100644 --- a/tests/integration-testscripts/common/integration_test.tpl +++ b/tests/integration-testscripts/common/integration_test.tpl @@ -18,7 +18,7 @@ </tr> <tr> <td>pause</td> - <td>500</td> + <td>1000</td> <td></td> </tr> <tr> diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index 71bd31efa6..2a420553b7 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -9,7 +9,7 @@ <fail unless="test.integration.antfile" message="test.integration.antfile must be set for integration tests to run"/>
<!-- Test with these browsers -->
- <property name="test_browsers" value="winxp-firefox36" />
+ <property name="test_browsers" value="winxp-safari5" />
<!-- Path to key file. Default value -->
<property name="sshkey.file" value="id_dsa" />
|