From 2bf490b9737397217f04323a3ebf7a14bc4f9db0 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 6 May 2022 14:47:29 +0100 Subject: [PATCH] Use non-default Tor ports for BridgeTest. --- .../java/org/briarproject/bramble/plugin/tor/BridgeTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java index d5a3a7e0d..4e4b0524f 100644 --- a/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java +++ b/bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java @@ -89,6 +89,9 @@ public class BridgeTest extends BrambleTestCase { private final static long MEEK_TIMEOUT = MINUTES.toMillis(6); private final static int UNREACHABLE_BRIDGES_ALLOWED = 6; private final static int ATTEMPTS_PER_BRIDGE = 5; + // Use different ports from Briar Desktop to avoid conflicts + private final static int SOCKS_PORT = DEFAULT_SOCKS_PORT + 10; + private final static int CONTROL_PORT = DEFAULT_CONTROL_PORT + 10; private final static Logger LOG = getLogger(BridgeTest.class.getName()); @@ -165,7 +168,7 @@ public class BridgeTest extends BrambleTestCase { networkManager, locationUtils, eventBus, torSocketFactory, backoffFactory, resourceProvider, bridgeProvider, batteryManager, clock, crypto, torDir, - DEFAULT_SOCKS_PORT, DEFAULT_CONTROL_PORT); + SOCKS_PORT, CONTROL_PORT); } @After