Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #48683 #48844

Merged
merged 1 commit into from
Jul 13, 2017
Merged

Automated cherry pick of #48683 #48844

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion federation/pkg/kubefed/init/init_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1376,7 +1376,11 @@ func tlsHandshake(t *testing.T, sCfg, cCfg *tls.Config) error {
}
}()

c, err := tls.Dial("tcp", s.Addr().String(), cCfg)
// workaround [::] not working in ipv4 only systems (https://github.com/golang/go/issues/18806)
// TODO: remove with Golang 1.9 with https://go-review.googlesource.com/c/45088/
addr := strings.TrimPrefix(s.Addr().String(), "[::]")

c, err := tls.Dial("tcp", addr, cCfg)
if err != nil {
// Intentionally not serializing the error received because we want to
// test for the failure case in the caller test function.
Expand Down