summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-09-08 21:00:28 +0300
committerMika Murtojarvi <mika@vaadin.com>2015-09-14 11:22:10 +0300
commit0dd2cf42652a3ebd2ac2c53f2bb35c837a72bdfc (patch)
tree1cc15a9ca04dfb25cc23d6dbc2a7fb3b66824bf6
parent6dd7022bca8fe8acfb74a5d34d4ff9cef7c7e43b (diff)
downloadvaadin-framework-0dd2cf42652a3ebd2ac2c53f2bb35c837a72bdfc.tar.gz
vaadin-framework-0dd2cf42652a3ebd2ac2c53f2bb35c837a72bdfc.zip
Don't use proxy port blocked by Firefox
Change-Id: I32d09c17ecbc65442305bb9e6853ff19b6dcfda4
-rwxr-xr-xuitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
index f8b01fb11b..460006b7f8 100755
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
+++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
@@ -50,8 +50,14 @@ public abstract class MultiBrowserTestWithProxy extends MultiBrowserTest {
protected Integer getProxyPort() {
if (proxyPort == null) {
- // Assumes we can use any port >= 2000
+ // Assumes we can use any port >= 2000,
+ // except for 2049 in Firefox...
proxyPort = availablePort.addAndGet(1);
+ if (proxyPort == 2049) {
+ // Restricted in Firefox, see
+ // http://www-archive.mozilla.org/projects/netlib/PortBanning.html#portlist
+ proxyPort = availablePort.addAndGet(1);
+ }
}
return proxyPort;
}