@@ -1,7 +1,9 @@ package net.spy.memcached; import java.net.InetSocketAddress; +import java.util.HashSet; import java.util.List; +import java.util.Set; import junit.framework.TestCase; @@ -94,7 +96,12 @@ public class AddrUtilTest extends TestCase { List<InetSocketAddress> addrs= AddrUtil.getAddresses("::1:80"); assertEquals(1, addrs.size()); - assertEquals("localhost", addrs.get(0).getHostName()); + + Set<String> validLocalhostNames=new HashSet<String>(); + validLocalhostNames.add("localhost"); + validLocalhostNames.add("ip6-localhost"); + validLocalhostNames.add("localhost6.localdomain6"); + assert(validLocalhostNames.contains(addrs.get(0).getHostName())); assertEquals(80, addrs.get(0).getPort()); } } src/test/java/net/spy/memcached/AddrUtilTest.java 720189210dbde12c7bfb8cb2fd5dc16e12a88756 Blair Zajac blair@orcaware.com http://github.com/dustin/java-memcached-client/commit/7831c780826f137607737a922d22a5ebf9b23b92 7831c780826f137607737a922d22a5ebf9b23b92 2009-11-06T09:46:13-08:00 2009-11-06T08:55:41-08:00 Fix AddrUtilTest#testIPv6Host() hostname assertion. This broke on operating systems where the IPv6 localhost is not listed in /etc/hosts as "localhost" but as "ip6-localhost" for Ubuntu or "localhost6.localdomain6" for Centos 5 and Foresight Linux. a4d36e0c364ca1e318428d297c91a0c63e9d1158 Dustin Sallings dustin@spy.net