diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2015-02-16 11:28:07 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-02-17 19:17:00 +0000 |
| commit | 1321b9f242d5355ed8d570b40d1f655a2b5ad14d (patch) | |
| tree | b3de5b1210dd5e5f12ad2caef371b3bab2e903df | |
| parent | a6d629529d79def3f1f211168433c3f7553256ad (diff) | |
| download | vaadin-framework-1321b9f242d5355ed8d570b40d1f655a2b5ad14d.tar.gz vaadin-framework-1321b9f242d5355ed8d570b40d1f655a2b5ad14d.zip | |
Add build parameter com.vaadin.testbench.hub.url.
Change-Id: I413c1dfffcba794aeaa33bbfef4b90b22f5f6fb7
| -rw-r--r-- | uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java | 11 | ||||
| -rw-r--r-- | uitest/tb3test.xml | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java index 32d0f1065c..a4645262a5 100644 --- a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java +++ b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java @@ -54,6 +54,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test { private static final String HOSTNAME_PROPERTY = "com.vaadin.testbench.deployment.hostname"; private static final String PORT_PROPERTY = "com.vaadin.testbench.deployment.port"; private static final String DEPLOYMENT_PROPERTY = "com.vaadin.testbench.deployment.url"; + private static final String HUB_URL = "com.vaadin.testbench.hub.url"; private static final Properties properties = new Properties(); private static final File propertiesFile = new File("work", "eclipse-run-selected-test.properties"); @@ -98,6 +99,16 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test { } @Override + protected String getHubURL() { + String hubUrl = getProperty(HUB_URL); + if(hubUrl == null || hubUrl.trim().isEmpty()) { + return super.getHubURL(); + } + + return hubUrl; + } + + @Override protected String getHubHostname() { return "tb3-hub.intra.itmill.com"; } diff --git a/uitest/tb3test.xml b/uitest/tb3test.xml index ecacf43ee2..8ae016f1e2 100644 --- a/uitest/tb3test.xml +++ b/uitest/tb3test.xml @@ -9,6 +9,7 @@ <property name="categories.exclude" value="" /> <property name="useLocalWebDriver" value="false" /> <property name="com.vaadin.testbench.max.retries" value="0" /> + <property name="com.vaadin.testbench.hub.url" value="" /> <property name="junit.test.suite" value="com.vaadin.tests.tb3.AllTB3Tests" /> <ivy:resolve file="${tb3test.dir}/ivy.xml" conf="build, build-provided" /> @@ -39,6 +40,7 @@ <jvmarg value="-Dcategories.exclude=${categories.exclude}" /> <jvmarg value="-DuseLocalWebDriver=${useLocalWebDriver}" /> <jvmarg value="-Dcom.vaadin.testbench.max.retries=${com.vaadin.testbench.max.retries}" /> + <jvmarg value="-Dcom.vaadin.testbench.hub.url=${com.vaadin.testbench.hub.url}" /> <test name="${junit.test.suite}" todir="${report.dir}" /> </junit> |