Author: bodewig
Date: Sun Aug 1 06:22:59 2010
New Revision: 981165
URL: http://svn.apache.org/viewvc?rev=981165&view=rev
Log:
vmgump doesn't resolve www.apache.org properly
Modified:
ant/core/trunk/src/tests/antunit/taskdefs/hostinfo-test.xml
Modified: ant/core/trunk/src/tests/antunit/taskdefs/hostinfo-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/hostinfo-test.xml?rev=981165&r1=981164&r2=981165&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/hostinfo-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/hostinfo-test.xml Sun Aug 1
06:22:59 2010
@@ -33,6 +33,7 @@
<property name="apache-ip4" value="140.211.11.131" />
<property name="apache-realhost.gump" value="140" />
+ <property name="apache-domain.gump" value="211.11.131" />
<property name="xs4all-hostname" value="www.xs4all.nl" />
<property name="xs4all-domain" value="xs4all.nl" />
@@ -52,10 +53,15 @@
<au:assertTrue>
<or>
<equals arg1="${apache-realhost}" arg2="${apache.NAME}"/>
- <equals arg1="${apache-realhost}.gump" arg2="${apache.NAME}"/>
+ <equals arg1="${apache-realhost.gump}" arg2="${apache.NAME}"/>
+ </or>
+ </au:assertTrue>
+ <au:assertTrue>
+ <or>
+ <equals arg1="${apache-domain}" arg2="${apache.DOMAIN}"/>
+ <equals arg1="${apache-domain.gump}" arg2="${apache.DOMAIN}"/>
</or>
</au:assertTrue>
- <au:assertEquals expected="${apache-domain}" actual="${apache.DOMAIN}"/>
<au:assertEquals expected="${apache-ip4}" actual="${apache.ADDR4}"/>
</target>
@@ -64,10 +70,15 @@
<au:assertTrue>
<or>
<equals arg1="${apache-realhost}" arg2="${NAME}"/>
- <equals arg1="${apache-realhost}.gump" arg2="${NAME}"/>
+ <equals arg1="${apache-realhost.gump}" arg2="${NAME}"/>
+ </or>
+ </au:assertTrue>
+ <au:assertTrue>
+ <or>
+ <equals arg1="${apache-domain}" arg2="${DOMAIN}"/>
+ <equals arg1="${apache-domain.gump}" arg2="${DOMAIN}"/>
</or>
</au:assertTrue>
- <au:assertEquals expected="${apache-domain}" actual="${DOMAIN}"/>
<au:assertEquals expected="${apache-ip4}" actual="${ADDR4}"/>
</target>
