Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge http2 integration test case into grpc case #8164

Merged
merged 3 commits into from
Jun 22, 2020
Merged

Conversation

freddygv
Copy link
Contributor

@freddygv freddygv commented Jun 22, 2020

Some changes to the fortio image broke the http2 integration test that was previously making a gRPC call using curl.

Since the http2 test case is using gRPC to test http2, this PR adds the additional checks from the http2 case to the gRPC case.

The ping in that test case seems to not be failing because it uses a fortio helper for grpc pings.

Addresses: https://circleci.com/gh/hashicorp/consul/197208

@freddygv freddygv requested a review from a team June 22, 2020 18:24
@dnephin
Copy link
Contributor

dnephin commented Jun 22, 2020

For my own understanding, the "s1 upstream should be able to connect to s2 via grpc" is effectively the replacement for the old "s1 upstream should be able to connect to s2 via http2", is that right?

Maybe add a comment above that case to say something about it covers http2 because grpc always uses http2 ?

@freddygv
Copy link
Contributor Author

@dnephin that's right, I added a comment about that

Copy link
Contributor

@dnephin dnephin left a comment

Choose a reason for hiding this comment

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

Oh, I missed this earlier. There's a list of test cases now in https://github.com/hashicorp/consul/blob/master/test/integration/connect/envoy/main_test.go#L31 that needs to be updated to remove http2.

otherwise LGTM

@freddygv freddygv merged commit cc1407e into master Jun 22, 2020
@freddygv freddygv deleted the expand-case-grpc branch June 22, 2020 19:09
@hashicorp-ci
Copy link
Contributor

🍒✅ Cherry pick of commit cc1407e onto release/1.8.x succeeded!

hashicorp-ci pushed a commit that referenced this pull request Jun 22, 2020
http2 is covered by grpc since grpc uses http2
rboyer pushed a commit that referenced this pull request Jul 7, 2020
http2 is covered by grpc since grpc uses http2

cherry-pick of #8164 onto origin/release/1.7.x
rboyer added a commit that referenced this pull request Jul 7, 2020
http2 is covered by grpc since grpc uses http2

cherry-pick of #8164 onto origin/release/1.7.x

Co-authored-by: Freddy <freddygv@users.noreply.github.com>
rboyer added a commit that referenced this pull request Jul 21, 2020
http2 is covered by grpc since grpc uses http2

cherry-pick of #8164 onto origin/release/1.6.x

Co-authored-by: Freddy <freddygv@users.noreply.github.com>
rboyer added a commit that referenced this pull request Jul 21, 2020
http2 is covered by grpc since grpc uses http2

cherry-pick of #8164 onto origin/release/1.6.x

Co-authored-by: Freddy <freddygv@users.noreply.github.com>

Co-authored-by: Freddy <freddygv@users.noreply.github.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.

4 participants