Browse Source

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

Joe Betz 7 years ago
parent
commit
05c57a0ea4
3 changed files with 11 additions and 2 deletions
  1. 9 0
      bill-of-materials.json
  2. 1 1
      integration/cluster.go
  3. 1 1
      integration/v3_grpc_test.go

+ 9 - 0
bill-of-materials.json

@@ -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": [

+ 1 - 1
integration/cluster.go

@@ -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

+ 1 - 1
integration/v3_grpc_test.go

@@ -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)
 	}
 }