From e741015b75b7331caf839d2500f592d0636304b1 Mon Sep 17 00:00:00 2001
From: "Jesse N. Glick" <jglick@apache.org>
Date: Tue, 10 Apr 2012 00:25:17 +0000
Subject: [PATCH] 
 https://builds.apache.org/pview/job/Ant-Build-Matrix/475/jdk=JDK%201.5%20(latest),label=Ubuntu/testReport/src.tests.antunit.taskdefs/hostinfo-test_xml/testApache/
 src/tests/antunit/taskdefs/hostinfo-test.xml:53: Assertion failed
 https://builds.apache.org/pview/job/Ant-Build-Matrix/475/jdk=JDK%201.5%20(latest),label=Ubuntu/testReport/src.tests.antunit.taskdefs/hostinfo-test_xml/testApacheNoPrefix/
 src/tests/antunit/taskdefs/hostinfo-test.xml:70: Expected 'eos' but was
 'aurora-2012' From my Linux machine: $ host www.apache.org www.apache.org has
 address 140.211.11.131 www.apache.org has address 192.87.106.229
 www.apache.org has IPv6 address 2001:610:1:80bc:192:87:106:229 www.apache.org
 mail is handled by 10 minotaur.apache.org. $ host 140.211.11.131
 131.11.211.140.in-addr.arpa domain name pointer eos.apache.org. $ host
 192.87.106.229 229.106.87.192.in-addr.arpa is an alias for
 229.224.106.87.192.in-addr.arpa. 229.224.106.87.192.in-addr.arpa domain name
 pointer aurora-2012.apache.org.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1311532 13f79535-47bb-0310-9956-ffa450edef68
---
 src/tests/antunit/taskdefs/hostinfo-test.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/tests/antunit/taskdefs/hostinfo-test.xml b/src/tests/antunit/taskdefs/hostinfo-test.xml
index ec54d79de..5fb68c577 100644
--- a/src/tests/antunit/taskdefs/hostinfo-test.xml
+++ b/src/tests/antunit/taskdefs/hostinfo-test.xml
@@ -30,6 +30,7 @@
   <property name="apache-hostname" value="www.apache.org" />
   <property name="apache-domain" value="apache.org" />
   <property name="apache-realhost" value="eos" />
+  <property name="apache-realhost.alt" value="aurora-2012" />
   <property name="apache-ip4" value="140.211.11.131" />
     
   <property name="apache-realhost.gump" value="www" />
@@ -53,6 +54,7 @@
       <au:assertTrue>
         <or>
           <equals arg1="${apache-realhost}" arg2="${apache.NAME}"/>
+          <equals arg1="${apache-realhost.alt}" arg2="${apache.NAME}"/>
           <equals arg1="${apache-realhost.gump}" arg2="${apache.NAME}"/>
         </or>
       </au:assertTrue>
@@ -67,10 +69,10 @@
 
     <target name="testApacheNoPrefix" depends="setUp">
       <hostinfo host="${apache-hostname}"/>
-      <au:assertEquals expected="${apache-realhost}" actual="${NAME}"/>
       <au:assertTrue>
         <or>
           <equals arg1="${apache-realhost}" arg2="${NAME}"/>
+          <equals arg1="${apache-realhost.alt}" arg2="${NAME}"/>
           <equals arg1="${apache-realhost.gump}" arg2="${NAME}"/>
         </or>
       </au:assertTrue>