Skip to content

Commit

Permalink
Merge http2 integration test case into grpc case (#8349)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
rboyer and freddygv authored Jul 21, 2020
1 parent 7053ee0 commit 8c6be97
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 85 deletions.
9 changes: 9 additions & 0 deletions test/integration/connect/envoy/case-grpc/verify.bats
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ load helpers
retry_default curl -f -s localhost:19001/stats -o /dev/null
}

@test "s1 proxy listener should be up and have right cert" {
assert_proxy_presents_cert_uri localhost:21000 s1
}

@test "s2 proxy listener should be up and have right cert" {
assert_proxy_presents_cert_uri localhost:21001 s2
}

@test "s2 proxy should be healthy" {
assert_service_has_healthy_instances s2 1
}
Expand All @@ -20,6 +28,7 @@ load helpers
}

@test "s1 upstream should be able to connect to s2 via grpc" {
# This test also covers http2 since gRPC always uses http2
run fortio grpcping localhost:5000

echo "OUTPUT: $output"
Expand Down
4 changes: 0 additions & 4 deletions test/integration/connect/envoy/case-http2/capture.sh

This file was deleted.

22 changes: 0 additions & 22 deletions test/integration/connect/envoy/case-http2/s1.hcl

This file was deleted.

14 changes: 0 additions & 14 deletions test/integration/connect/envoy/case-http2/s2.hcl

This file was deleted.

6 changes: 0 additions & 6 deletions test/integration/connect/envoy/case-http2/setup.sh

This file was deleted.

39 changes: 0 additions & 39 deletions test/integration/connect/envoy/case-http2/verify.bats

This file was deleted.

0 comments on commit 8c6be97

Please sign in to comment.