Skip to content

test: deflaking yet another test#19775

Merged
alyssawilk merged 4 commits intoenvoyproxy:mainfrom
alyssawilk:flake
Feb 3, 2022
Merged

test: deflaking yet another test#19775
alyssawilk merged 4 commits intoenvoyproxy:mainfrom
alyssawilk:flake

Conversation

@alyssawilk
Copy link
Copy Markdown
Contributor

@alyssawilk alyssawilk commented Feb 1, 2022

As detailed in the linked issue, the lack of delay-close in integration tests was causing windows to react to FINs before reading error bodies, so turning up delay close.

Fixes #19430

@repokitteh-read-only
Copy link
Copy Markdown

As a reminder, PRs marked as draft will not be automatically assigned reviewers,
or be handled by maintainer-oncall triage.

Please mark your PR as ready when you want it to be reviewed!

🐱

Caused by: #19775 was opened by alyssawilk.

see: more, trace.

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
@alyssawilk alyssawilk marked this pull request as ready for review February 2, 2022 16:32
@alyssawilk alyssawilk enabled auto-merge (squash) February 2, 2022 16:34
Copy link
Copy Markdown
Contributor

@adisuissa adisuissa left a comment

Choose a reason for hiding this comment

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

Thanks for the cleanup.
Left a couple of minor comments and a question.
/wait

@@ -464,6 +464,7 @@ name: matcher
auto response = codec_client_->makeRequestWithBody(default_request_headers_, 1024);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The call to makeHttpConnection in line 461 should be moved here (as is done in the other test that was updated).


ASSERT_TRUE(response->waitForEndStream());
EXPECT_THAT(response->headers(), HttpStatusIs("200"));
codec_client_->close();
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nit: the codec_client_->close() on line 493 is moot.

Question: What is the purpose of the second codec, after the codec_client_ is already closed? will the rest of this test just be the same as using codec_client_ instead of second_codec?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure. maybe it was intentional to have 2 connections? I'll leave the final close hre and remove the prior just in case

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Copy link
Copy Markdown
Contributor

@adisuissa adisuissa left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@alyssawilk alyssawilk merged commit 0369a62 into envoyproxy:main Feb 3, 2022
joshperry pushed a commit to joshperry/envoy that referenced this pull request Feb 13, 2022
As detailed in the linked issue, the lack of delay-close in integration tests was causing windows to react to FINs before reading error bodies, so turning up delay close.

Fixes envoyproxy#19430

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: Josh Perry <josh.perry@mx.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

HandleUpstreamSocketFail flakes on windows

2 participants