Make proxy_test work on machines with only IPv6 addresses as well.

Author: easwars

cmd/cloud_sql_proxy/proxy_test.go

@@ -17,6 +17,7 @@ package main
 import (
 	"bytes"
 	"io/ioutil"
+	"net"
 	"net/http"
 	"testing"
 )
@@ -99,54 +100,64 @@ func TestParseInstanceConfig(t *testing.T) {
 		// inputs
 		dir, instance string
 
-		wantCfg instanceConfig
-		wantErr bool
+		wantCfg               instanceConfig
+		wantErr, wantLoopback bool
 	}{
 		{
 			"/x", "domain.com:my-proj:my-reg:my-instance",
 			instanceConfig{"domain.com:my-proj:my-reg:my-instance", "unix", "/x/domain.com:my-proj:my-reg:my-instance"},
-			false,
+			false, false,
 		}, {
 			"/x", "my-proj:my-reg:my-instance",
 			instanceConfig{"my-proj:my-reg:my-instance", "unix", "/x/my-proj:my-reg:my-instance"},
-			false,
+			false, false,
 		}, {
 			"/x", "my-proj:my-reg:my-instance=tcp:1234",
-			instanceConfig{"my-proj:my-reg:my-instance", "tcp", "127.0.0.1:1234"},
-			false,
+			instanceConfig{"my-proj:my-reg:my-instance", "tcp", "[::1]:1234"},
+			false, true,
 		}, {
 			"/x", "my-proj:my-reg:my-instance=tcp:my-host:1111",
 			instanceConfig{"my-proj:my-reg:my-instance", "tcp", "my-host:1111"},
-			false,
+			false, false,
 		}, {
 			"/x", "my-proj:my-reg:my-instance=",
 			instanceConfig{},
-			true,
+			true, false,
 		}, {
 			"/x", "my-proj:my-reg:my-instance=cool network",
 			instanceConfig{},
-			true,
+			true, false,
 		}, {
 			"/x", "my-proj:my-reg:my-instance=cool network:1234",
 			instanceConfig{},
-			true,
+			true, false,
 		}, {
 			"/x", "my-proj:my-reg:my-instance=oh:so:many:colons",
 			instanceConfig{},
-			true,
+			true, false,
 		},
 	} {
 		got, err := parseInstanceConfig(v.dir, v.instance, mockClient)
 		if v.wantErr {
 			if err == nil {
-				t.Errorf("parseInstanceConfig(%s, %s) = %+v, wanted error", got)
+				t.Errorf("parseInstanceConfig(%s, %s) = %+v, wanted error", v.dir, v.instance, got)
 			}
 			continue
 		} else if err != nil {
 			t.Errorf("parseInstanceConfig(%s, %s) had unexpected error: %v", v.dir, v.instance, err)
 			continue
 		}
 		if got != v.wantCfg {
+			if v.wantLoopback {
+				host, _, err := net.SplitHostPort(got.Address)
+				if err != nil {
+					t.Errorf("parseInstanceConfig(%s, %s) = %+v, want %+v", v.dir, v.instance, got, v.wantCfg)
+				}
+				ip := net.ParseIP(host)
+				if ip.IsLoopback() {
+					continue
+				}
+			}
 			t.Errorf("parseInstanceConfig(%s, %s) = %+v, want %+v", v.dir, v.instance, got, v.wantCfg)
 		}
 	}