Fix for tests

Justin Fudally · Justin Fudally · commit ac14e0d31e09 · 2020-03-05T17:03:42.000-06:00
diff --git a/go/config/haproxy_config.go b/go/config/haproxy_config.go
@@ -28,6 +28,10 @@ func (h *HostPort) URL() *url.URL {
 
 func ParseHostPort(address string) (hostPort *HostPort, err error) {
 	if !strings.Contains(address, ":") {
+		if address == "" {
+			return &HostPort{address, 80}, fmt.Errorf("Invalid host address: %s", address)
+		}
+
 		return &HostPort{Host: address, Port: 80}, nil
 	}
 
diff --git a/go/config/haproxy_config_test.go b/go/config/haproxy_config_test.go
@@ -71,7 +71,7 @@ func TestParseAddresses(t *testing.T) {
 	{
 		c := &HAProxyConfigurationSettings{Addresses: "localhost"}
 		_, err := c.parseAddresses()
-		test.S(t).ExpectNotNil(err)
+		test.S(t).ExpectNil(err)
 	}
 	{
 		c := &HAProxyConfigurationSettings{Addresses: "localhost:"}

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,10 @@ func (h HostPort) URL() url.URL {`
`28`	`28`
`29`	`29`	`func ParseHostPort(address string) (hostPort *HostPort, err error) {`
`30`	`30`	`if !strings.Contains(address, ":") {`
	`31`	`+ if address == "" {`
	`32`	`+ return &HostPort{address, 80}, fmt.Errorf("Invalid host address: %s", address)`
	`33`	`+ }`
	`34`	`+`
`31`	`35`	`return &HostPort{Host: address, Port: 80}, nil`
`32`	`36`	`}`
`33`	`37`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func TestParseAddresses(t *testing.T) {`
`71`	`71`	`{`
`72`	`72`	`c := &HAProxyConfigurationSettings{Addresses: "localhost"}`
`73`	`73`	`_, err := c.parseAddresses()`
`74`		`- test.S(t).ExpectNotNil(err)`
	`74`	`+ test.S(t).ExpectNil(err)`
`75`	`75`	`}`
`76`	`76`	`{`
`77`	`77`	`c := &HAProxyConfigurationSettings{Addresses: "localhost:"}`