MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary socket.setReuseAddress() in test extensions

This commit is contained in:
Chris Eager 2024-10-18 11:23:35 -05:00 committed by Chris Eager
parent c6843c1eae
commit b5db8eba06
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
service/src/test/java/org/whispersystems/textsecuregcm/redis/RedisClusterExtension.java
View File

@ -202,7 +202,6 @@ public class RedisClusterExtension implements BeforeAllCallback, BeforeEachCallb
final int maxIterations = 11_000; final int maxIterations = 11_000;
for (int i = 0; i < maxIterations; i++) { for (int i = 0; i < maxIterations; i++) {
try (final ServerSocket socket = new ServerSocket(0)) { try (final ServerSocket socket = new ServerSocket(0)) {
socket.setReuseAddress(false);
final int port = socket.getLocalPort(); final int port = socket.getLocalPort();
if (port < 55535) { if (port < 55535) {
return port; return port;

1
service/src/test/java/org/whispersystems/textsecuregcm/redis/RedisServerExtension.java
View File

@ -93,7 +93,6 @@ public class RedisServerExtension implements BeforeAllCallback, BeforeEachCallba
private static int getAvailablePort() throws IOException { private static int getAvailablePort() throws IOException {
try (ServerSocket socket = new ServerSocket(0)) { try (ServerSocket socket = new ServerSocket(0)) {
socket.setReuseAddress(false);
return socket.getLocalPort(); return socket.getLocalPort();
} }
} }

10
service/src/test/java/org/whispersystems/textsecuregcm/storage/DynamoDbExtension.java
View File

@ -144,14 +144,10 @@ public class DynamoDbExtension implements BeforeEachCallback, AfterEachCallback
} }
private void startServer() throws Exception { private void startServer() throws Exception {
// Even though we're using AWS SDK v2, Dynamo's local implementation's canonical location
// is within v1 (https://github.com/aws/aws-sdk-java-v2/issues/982). This does support
// v2 clients, though.
loadLibrary(); loadLibrary();
ServerSocket serverSocket = new ServerSocket(0); try (ServerSocket serverSocket = new ServerSocket(0)) {
serverSocket.setReuseAddress(false); port = serverSocket.getLocalPort();
port = serverSocket.getLocalPort(); }
serverSocket.close();
server = ServerRunner.createServerFromCommandLineArgs(new String[]{"-inMemory", "-port", String.valueOf(port)}); server = ServerRunner.createServerFromCommandLineArgs(new String[]{"-inMemory", "-port", String.valueOf(port)});
server.start(); server.start();
} }