From 8dd8b1bb02f9992909c7bd08f8922eb9f35a5052 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 28 Jul 2010 17:08:37 +0000
Subject: [PATCH] something seems to be wrong with vmgump's hostname resolution
 - allow for alternative real host names

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

diff --git a/src/tests/antunit/taskdefs/hostinfo-test.xml b/src/tests/antunit/taskdefs/hostinfo-test.xml
index 3e72ff96e..641e8cd8e 100644
--- a/src/tests/antunit/taskdefs/hostinfo-test.xml
+++ b/src/tests/antunit/taskdefs/hostinfo-test.xml
@@ -32,6 +32,8 @@
   <property name="apache-realhost" value="freyr" />
   <property name="apache-ip4" value="140.211.11.131" />
     
+  <property name="apache-realhost.gump" value="140" />
+
   <property name="xs4all-hostname" value="www.xs4all.nl" />
   <property name="xs4all-domain" value="xs4all.nl" />
   <property name="xs4all-realhost" value="www" />
@@ -47,14 +49,24 @@
 
     <target name="testApache" depends="setUp">
       <hostinfo prefix="apache" host="${apache-hostname}"/>
-      <au:assertEquals expected="${apache-realhost}" actual="${apache.NAME}"/>
+      <au:assertTrue>
+        <or>
+          <equals arg1="${apache-realhost}" arg2="${apache.NAME}"/>
+          <equals arg1="${apache-realhost}.gump" arg2="${apache.NAME}"/>
+        </or>
+      </au:assertTrue>
       <au:assertEquals expected="${apache-domain}" actual="${apache.DOMAIN}"/>
       <au:assertEquals expected="${apache-ip4}" actual="${apache.ADDR4}"/>
     </target>
 
     <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}.gump" arg2="${NAME}"/>
+        </or>
+      </au:assertTrue>
       <au:assertEquals expected="${apache-domain}" actual="${DOMAIN}"/>
       <au:assertEquals expected="${apache-ip4}" actual="${ADDR4}"/>
     </target>