opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: gofmt/goimports simplify

Browse Source
This commit is contained in:
Tamir Duberstein
2016-07-27 10:46:58 -04:00
parent 711a24cde2
commit 9aa8038716
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -5,6 +5,7 @@ go:
- 1.6 - 1.6
before_install: before_install:
- go get golang.org/x/tools/cmd/goimports
- go get github.com/axw/gocov/gocov - go get github.com/axw/gocov/gocov
- go get github.com/mattn/goveralls - go get github.com/mattn/goveralls
- go get golang.org/x/tools/cmd/cover - go get golang.org/x/tools/cmd/cover
@ -14,4 +15,6 @@ install:
- mv "$TRAVIS_BUILD_DIR" "$GOPATH/src/google.golang.org/grpc" - mv "$TRAVIS_BUILD_DIR" "$GOPATH/src/google.golang.org/grpc"
script: script:
- '! gofmt -s -d -l . 2>&1 | read'
- '! goimports -l . | read'
- make test testrace - make test testrace

6
balancer_test.go
View File

@ -243,7 +243,7 @@ func TestCloseWithPendingRPC(t *testing.T) {
t.Fatalf("grpc.Invoke(_, _, _, _, _) = %v, want %s", err, servers[0].port) t.Fatalf("grpc.Invoke(_, _, _, _, _) = %v, want %s", err, servers[0].port)
} }
// Remove the server. // Remove the server.
updates := []*naming.Update{&naming.Update{ updates := []*naming.Update{{
Op: naming.Delete, Op: naming.Delete,
Addr: "127.0.0.1:" + servers[0].port, Addr: "127.0.0.1:" + servers[0].port,
}} }}
@ -287,7 +287,7 @@ func TestGetOnWaitChannel(t *testing.T) {
t.Fatalf("Failed to create ClientConn: %v", err) t.Fatalf("Failed to create ClientConn: %v", err)
} }
// Remove all servers so that all upcoming RPCs will block on waitCh. // Remove all servers so that all upcoming RPCs will block on waitCh.
updates := []*naming.Update{&naming.Update{ updates := []*naming.Update{{
Op: naming.Delete, Op: naming.Delete,
Addr: "127.0.0.1:" + servers[0].port, Addr: "127.0.0.1:" + servers[0].port,
}} }}
@ -310,7 +310,7 @@ func TestGetOnWaitChannel(t *testing.T) {
} }
}() }()
// Add a connected server to get the above RPC through. // Add a connected server to get the above RPC through.
updates = []*naming.Update{&naming.Update{ updates = []*naming.Update{{
Op: naming.Add, Op: naming.Add,
Addr: "127.0.0.1:" + servers[0].port, Addr: "127.0.0.1:" + servers[0].port,
}} }}

2
benchmark/client/main.go
View File

@ -58,7 +58,7 @@ func closeLoopUnary() {
for i := 0; i < *maxConcurrentRPCs; i++ { for i := 0; i < *maxConcurrentRPCs; i++ {
go func() { go func() {
for _ = range ch { for range ch {
start := time.Now() start := time.Now()
unaryCaller(tc) unaryCaller(tc)
elapse := time.Since(start) elapse := time.Since(start)

6
server_test.go
View File

@ -91,14 +91,14 @@ func TestGetServiceInfo(t *testing.T) {
info := server.GetServiceInfo() info := server.GetServiceInfo()
want := map[string]*ServiceInfo{ want := map[string]*ServiceInfo{
"grpc.testing.EmptyService": &ServiceInfo{ "grpc.testing.EmptyService": {
Methods: []MethodInfo{ Methods: []MethodInfo{
MethodInfo{ {
Name: "EmptyCall", Name: "EmptyCall",
IsClientStream: false, IsClientStream: false,
IsServerStream: false, IsServerStream: false,
}, },
MethodInfo{ {
Name: "EmptyStream", Name: "EmptyStream",
IsClientStream: true, IsClientStream: true,
IsServerStream: false, IsServerStream: false,