Skip to content

Conversation

@polarbear567
Copy link
Contributor

fix issue 29502

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Jan 21, 2022
@philwebb philwebb added type: task A general task and removed status: waiting-for-triage An issue we've not yet triaged labels Jan 21, 2022
@philwebb philwebb added this to the 2.5.x milestone Jan 21, 2022
this.server.handle(this.request, this.response);
this.serverChannel.disconnect();
this.server.getServerThread().join();
this.server.getServerThread().join(2000);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should extract this to a constant in case we need to tweak the timings later?

Copy link
Member

@wilkinsona wilkinsona Jan 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1. I suspect we'll need longer than two seconds as well for it not to be flaky on CI.

@wilkinsona wilkinsona changed the title Use a timeout when joining the thread. Tests that join the server thread in HttpTunnelServerTests may run indefinitely Jan 21, 2022
@philwebb philwebb added the for: merge-with-amendments Needs some changes when we merge label Jan 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

for: merge-with-amendments Needs some changes when we merge type: task A general task

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants