You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2012/04/10 06:39:57 UTC
svn commit: r1311573 -
/ant/core/trunk/src/tests/antunit/taskdefs/hostinfo-test.xml
Author: bodewig
Date: Tue Apr 10 04:39:56 2012
New Revision: 1311573
URL: http://svn.apache.org/viewvc?rev=1311573&view=rev
Log:
Jenkins build boxes 'see' a different www.apache.org from the rest of the world
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=1311573&r1=1311572&r2=1311573&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/hostinfo-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/hostinfo-test.xml Tue Apr 10 04:39:56 2012
@@ -32,7 +32,8 @@
<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-ip4.alt" value="192.87.106.229"/>
+
<property name="apache-realhost.gump" value="www" />
<property name="apache-domain.gump" value="apache.org" />
@@ -64,7 +65,12 @@
<equals arg1="${apache-domain.gump}" arg2="${apache.DOMAIN}"/>
</or>
</au:assertTrue>
- <au:assertEquals expected="${apache-ip4}" actual="${apache.ADDR4}"/>
+ <au:assertTrue>
+ <or>
+ <equals arg1="${apache-ip4}" arg2="${apache.ADDR4}"/>
+ <equals arg1="${apache-ip4.alt}" arg2="${apache.ADDR4}"/>
+ </or>
+ </au:assertTrue>
</target>
<target name="testApacheNoPrefix" depends="setUp">
@@ -82,7 +88,12 @@
<equals arg1="${apache-domain.gump}" arg2="${DOMAIN}"/>
</or>
</au:assertTrue>
- <au:assertEquals expected="${apache-ip4}" actual="${ADDR4}"/>
+ <au:assertTrue>
+ <or>
+ <equals arg1="${apache-ip4}" arg2="${ADDR4}"/>
+ <equals arg1="${apache-ip4.alt}" arg2="${ADDR4}"/>
+ </or>
+ </au:assertTrue>
</target>
<target name="testReverse" depends="setUp">