Skip to content

Commit 629f8ed

Browse files
committed
[FAB-11908] Upgrade to grpc-go 1.15
Update to latest version of grpc-go. Modified test to no longer use the the transport package which has been made internal. Change-Id: Id92c95ddc0cea18d4300840cf6e80f0a01993bb8 Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
1 parent f897eda commit 629f8ed

File tree

224 files changed

+45188
-8925
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+45188
-8925
lines changed

Gopkg.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ noverify = [
114114

115115
[[constraint]]
116116
name = "google.golang.org/grpc"
117-
version = "=1.13.0"
117+
version = "=1.15.0"
118118

119119
[[constraint]]
120120
name = "gopkg.in/alecthomas/kingpin.v2"

core/comm/server_test.go

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"google.golang.org/grpc"
3131
"google.golang.org/grpc/codes"
3232
"google.golang.org/grpc/credentials"
33+
"google.golang.org/grpc/keepalive"
3334
"google.golang.org/grpc/status"
34-
"google.golang.org/grpc/transport"
3535
)
3636

3737
// Embedded certificates for testing
@@ -1538,27 +1538,44 @@ func TestKeepaliveClientResponse(t *testing.T) {
15381538
}
15391539
testAddress := lis.Addr().String()
15401540
srv, err := comm.NewGRPCServerFromListener(lis, comm.ServerConfig{KaOpts: kap})
1541-
assert.NoError(t, err, "Unexpected error starting GRPCServer")
1541+
if err != nil {
1542+
t.Fatalf("Failed to create GRPCServer [%s]", err)
1543+
}
1544+
testpb.RegisterEmptyServiceServer(srv.Server(), &emptyServiceServer{})
15421545
go srv.Start()
15431546
defer srv.Stop()
15441547

1545-
// test that connection does not close with response to ping
1546-
connectCtx, cancel := context.WithTimeout(context.Background(), time.Second)
1547-
clientTransport, err := transport.NewClientTransport(
1548-
connectCtx,
1548+
//create GRPC client conn
1549+
clientCtx, cancel := context.WithTimeout(context.Background(), time.Second)
1550+
defer cancel()
1551+
clientConn, err := grpc.DialContext(
1552+
clientCtx,
1553+
testAddress,
1554+
grpc.WithBlock(),
1555+
grpc.WithInsecure(),
1556+
grpc.WithKeepaliveParams(keepalive.ClientParameters{
1557+
PermitWithoutStream: true,
1558+
}),
1559+
)
1560+
if err != nil {
1561+
t.Fatalf("Failed to create gRPC client conn [%s]", err)
1562+
}
1563+
defer clientConn.Close()
1564+
1565+
stream, err := testpb.NewEmptyServiceClient(clientConn).EmptyStream(
15491566
context.Background(),
1550-
transport.TargetInfo{Addr: testAddress},
1551-
transport.ConnectOptions{},
1552-
func() {},
15531567
)
1554-
cancel()
1555-
assert.NoError(t, err, "Unexpected error creating client transport")
1556-
defer clientTransport.Close()
1568+
if err != nil {
1569+
t.Fatalf("Failed to create EmptyServiceClient [%s]", err)
1570+
}
1571+
err = stream.Send(new(testpb.Empty))
1572+
assert.NoError(t, err, "failed to send message")
1573+
15571574
// sleep past keepalive timeout
15581575
time.Sleep(1500 * time.Millisecond)
1559-
// try to create a stream
1560-
_, err = clientTransport.NewStream(context.Background(), &transport.CallHdr{})
1561-
assert.NoError(t, err, "Unexpected error creating stream")
1576+
err = stream.Send(new(testpb.Empty))
1577+
assert.NoError(t, err, "failed to send message")
1578+
15621579
}
15631580

15641581
func TestUpdateTLSCert(t *testing.T) {

vendor/golang.org/x/sys/unix/aliases.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/sys/unix/cap_freebsd.go

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/sys/unix/constants.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/sys/unix/dev_aix_ppc.go

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/sys/unix/dev_aix_ppc64.go

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/golang.org/x/sys/unix/dirent.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)