Merge pull request kubernetes#94376 from mkumatag/patch-2

k8s-ci-robot · web-flow · commit 0d2205f515d8 · 2020-09-01T19:41:53.000-07:00
Skip TestLoopbackHostPortIPv6 run on non-IPv6 env
diff --git a/staging/src/k8s.io/apiserver/pkg/server/config_selfclient_test.go b/staging/src/k8s.io/apiserver/pkg/server/config_selfclient_test.go
@@ -60,7 +60,7 @@ func TestLoopbackHostPortIPv6(t *testing.T) {
 		t.Fatalf("fail to enumerate network interface, %s", err)
 	}
 	if !ipv6 {
-		t.Fatalf("no ipv6 loopback interface")
+		t.Skip("no ipv6 loopback interface")
 	}
 
 	host, port, err := LoopbackHostPort("[ff06:0:0:0:0:0:0:c3]:443")

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func TestLoopbackHostPortIPv6(t *testing.T) {`
`60`	`60`	`t.Fatalf("fail to enumerate network interface, %s", err)`
`61`	`61`	`}`
`62`	`62`	`if !ipv6 {`
`63`		`- t.Fatalf("no ipv6 loopback interface")`
	`63`	`+ t.Skip("no ipv6 loopback interface")`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`host, port, err := LoopbackHostPort("[ff06:0:0:0:0:0:0:c3]:443")`