Merge pull request gravitational#464 from gravitational/dmitri/fix-ut…

…ils-addr-edge-cases Cover the missing edge cases to replicate the old behavior
mckellyln · Jun 25, 2016 · d8293ac · d8293ac
2 parents a9e2e94 + 43ba205
commit d8293ac
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/lib/utils/addr.go b/lib/utils/addr.go
@@ -326,8 +326,11 @@ func guessHostIP(ifaces []netInterface) (ip net.IP) {
 			}
 		}
 	}
-	// did not find anything? return loopback
 	if ip == nil {
+		if len(ips) > 0 {
+			return ips[0]
+		}
+		// fallback to loopback
 		ip = net.IPv4(127, 0, 0, 1)
 	}
 	return ip

diff --git a/lib/utils/addr_test.go b/lib/utils/addr_test.go
@@ -185,14 +185,25 @@ func (s *AddrTestSuite) TestGuessesIPAddress(c *C) {
 			ifaces: []netInterface{
 				iface{
 					addrs: []net.Addr{
-						&net.IPAddr{IP: net.ParseIP("172.192.12.1")},
+						&net.IPAddr{IP: net.ParseIP("52.35.21.180")},
 						&net.IPAddr{IP: net.ParseIP("fe80::af:6dff:fefd:150f")},
 					},
 				},
 			},
-			expected: net.ParseIP("172.192.12.1"),
+			expected: net.ParseIP("52.35.21.180"),
 			comment:  "ignores IPv6",
 		},
+		{
+			ifaces: []netInterface{
+				iface{
+					addrs: []net.Addr{
+						&net.IPAddr{IP: net.ParseIP("fe80::af:6dff:fefd:150f")},
+					},
+				},
+			},
+			expected: net.ParseIP("127.0.0.1"),
+			comment:  "falls back to loopback",
+		},
 	}
 
 	for _, testCase := range testCases {