integration: Fix unit test failures from new grpc LB changes, fix bom

This commit is contained in:
Joe Betz 2018-05-24 16:14:22 -07:00 committed by Gyuho Lee
parent 55ef9cc1d0
commit 05c57a0ea4
3 changed files with 11 additions and 2 deletions

View File

@ -134,6 +134,15 @@
}
]
},
{
"project": "github.com/grpc-ecosystem/go-grpc-middleware/util/backoffutils",
"licenses": [
{
"type": "Apache License 2.0",
"confidence": 1
}
]
},
{
"project": "github.com/grpc-ecosystem/go-grpc-prometheus",
"licenses": [

View File

@ -981,7 +981,7 @@ func WaitClientV3(t *testing.T, kv clientv3.KV) {
var err error
for time.Now().Before(timeout) {
ctx, cancel := context.WithTimeout(context.Background(), requestTimeout)
_, err := kv.Get(ctx, "/")
_, err = kv.Get(ctx, "/")
cancel()
if err == nil {
return

View File

@ -1948,6 +1948,6 @@ func waitForRestart(t *testing.T, kvc pb.KVClient) {
}
}
if err != nil {
t.Fatal("timed out waiting for restart: %v", err)
t.Fatalf("timed out waiting for restart: %v", err)
}
}