SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix port discovery in GCF test

Browse Source
This commit is contained in:
Oleg Zhurakousky
2020-08-06 15:50:33 +02:00
parent dcb3a9ffbc
commit 9e9467fac0
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/LocalServerTestSupport.java
View File

@@ -32,7 +32,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import com.google.cloud.functions.invoker.runner.Invoker; import com.google.cloud.functions.invoker.runner.Invoker;
import com.google.gson.Gson; import com.google.gson.Gson;
@@ -42,6 +41,7 @@ import org.springframework.cloud.function.adapter.gcp.FunctionInvoker;
import org.springframework.http.HttpEntity; import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.util.SocketUtils;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -59,8 +59,6 @@ final public class LocalServerTestSupport {
private static final String SERVER_READY_STRING = "Started ServerConnector"; private static final String SERVER_READY_STRING = "Started ServerConnector";
private static AtomicInteger nextPort = new AtomicInteger(55555);
private LocalServerTestSupport() { private LocalServerTestSupport() {
} }
@@ -86,7 +84,7 @@ final public class LocalServerTestSupport {
static ServerProcess startServer(Class<?> springApplicationMainClass, String function) static ServerProcess startServer(Class<?> springApplicationMainClass, String function)
throws InterruptedException, IOException { throws InterruptedException, IOException {
int port = nextPort.getAndIncrement(); int port = SocketUtils.findAvailableTcpPort();
String signatureType = "http"; String signatureType = "http";
String target = FunctionInvoker.class.getCanonicalName(); String target = FunctionInvoker.class.getCanonicalName();