Merge pull request kubernetes#84796 from damemi/fix-graceful-shutdown

k8s-ci-robot · web-flow · commit 6d0994fa66e3 · 2019-11-11T00:05:40.000-08:00
Fixed error check in graceful shutdown test
diff --git a/test/integration/master/graceful_shutdown_test.go b/test/integration/master/graceful_shutdown_test.go
@@ -92,8 +92,8 @@ func TestGracefulShutdown(t *testing.T) {
 	}
 	body.Close()
 	respErr := <-respErrCh
-	if err != nil {
-		t.Fatal(err)
+	if respErr.err != nil {
+		t.Fatal(respErr.err)
 	}
 	defer respErr.resp.Body.Close()
 	bs, err := ioutil.ReadAll(respErr.resp.Body)

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,8 @@ func TestGracefulShutdown(t *testing.T) {`
`92`	`92`	`}`
`93`	`93`	`body.Close()`
`94`	`94`	`respErr := <-respErrCh`
`95`		`- if err != nil {`
`96`		`- t.Fatal(err)`
	`95`	`+ if respErr.err != nil {`
	`96`	`+ t.Fatal(respErr.err)`
`97`	`97`	`}`
`98`	`98`	`defer respErr.resp.Body.Close()`
`99`	`99`	`bs, err := ioutil.ReadAll(respErr.resp.Body)`