root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Attempt to stabilize stopTriggersTunnelClose 

Closes gh-26856
This commit is contained in:
Andy Wilkinson 2021-06-11 15:48:50 +01:00
parent 29f9fc1c06
commit 186658cc12
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/client/TunnelClientTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -24,7 +24,9 @@ import java.nio.ByteBuffer;
import java.nio.channels.Channels; import java.nio.channels.Channels;
import java.nio.channels.SocketChannel; import java.nio.channels.SocketChannel;
import java.nio.channels.WritableByteChannel; import java.nio.channels.WritableByteChannel;
import java.time.Duration;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -85,9 +87,10 @@ class TunnelClientTests {
TunnelClient client = new TunnelClient(0, this.tunnelConnection); TunnelClient client = new TunnelClient(0, this.tunnelConnection);
int port = client.start(); int port = client.start();
SocketChannel channel = SocketChannel.open(new InetSocketAddress(port)); SocketChannel channel = SocketChannel.open(new InetSocketAddress(port));
Thread.sleep(200); Awaitility.await().atMost(Duration.ofSeconds(30)).until(this.tunnelConnection::getOpenedTimes,
(times) -> times == 1);
assertThat(this.tunnelConnection.isOpen()).isTrue();
client.stop(); client.stop();
assertThat(this.tunnelConnection.getOpenedTimes()).isEqualTo(1);
assertThat(this.tunnelConnection.isOpen()).isFalse(); assertThat(this.tunnelConnection.isOpen()).isFalse();
assertThat(channel.read(ByteBuffer.allocate(1))).isEqualTo(-1); assertThat(channel.read(ByteBuffer.allocate(1))).isEqualTo(-1);
} }