Merge pull request #181 from pohly/connection-nil

k8s-ci-robot · web-flow · commit 45257885dfae · 2019-03-21T09:25:40.000-07:00
sanity: avoid nil access for connection
diff --git a/pkg/sanity/sanity.go b/pkg/sanity/sanity.go
@@ -140,7 +140,9 @@ func Test(t *testing.T, reqConfig *Config) {
 		specReporters = append(specReporters, junitReporter)
 	}
 	RunSpecsWithDefaultAndCustomReporters(t, "CSI Driver Test Suite", specReporters)
-	sc.Conn.Close()
+	if sc.Conn != nil {
+		sc.Conn.Close()
+	}
 }
 
 func GinkgoTest(reqConfig *Config) {

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,9 @@ func Test(t testing.T, reqConfig Config) {`
`140`	`140`	`specReporters = append(specReporters, junitReporter)`
`141`	`141`	`}`
`142`	`142`	`RunSpecsWithDefaultAndCustomReporters(t, "CSI Driver Test Suite", specReporters)`
`143`		`- sc.Conn.Close()`
	`143`	`+ if sc.Conn != nil {`
	`144`	`+ sc.Conn.Close()`
	`145`	`+ }`
`144`	`146`	`}`
`145`	`147`
`146`	`148`	`func GinkgoTest(reqConfig *Config) {`