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 2016/03/29 18:18:42 UTC

[2/3] ant-antlibs-antunit git commit: deal with proxies that mask 404s

deal with proxies that mask 404s


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-antunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-antlibs-antunit/commit/08b3a72b
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-antunit/tree/08b3a72b
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-antunit/diff/08b3a72b

Branch: refs/heads/master
Commit: 08b3a72b2e7ba1df25643f90de02b5ed2d59a038
Parents: 81f284f
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Mar 29 17:46:52 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Mar 29 17:46:52 2016 +0200

----------------------------------------------------------------------
 src/tests/antunit/assertResourceExists-test.xml | 28 +++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-antlibs-antunit/blob/08b3a72b/src/tests/antunit/assertResourceExists-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/assertResourceExists-test.xml b/src/tests/antunit/assertResourceExists-test.xml
index b7b3306..ce15bf7 100644
--- a/src/tests/antunit/assertResourceExists-test.xml
+++ b/src/tests/antunit/assertResourceExists-test.xml
@@ -19,29 +19,49 @@
 
   <import file="antunit-base.xml"/>
 
+  <property name="existing-url" value="http://ant.apache.org/index.html"/>
+  <property name="not-existing-url" value="http://ant.apache.org/foo.html"/>
+
+  <!-- some strange proxy setups hide the 404 results -->
+  <target name="-checkWhetherUrlsThatDontExistAreFound">
+    <condition property="cant.trust.urlcheck">
+      <http url="${not-existing-url}"/>
+    </condition>
+  </target>
+
+  <target name="-logWhetherUrlsThatDontExistAreFound"
+          depends="-checkWhetherUrlsThatDontExistAreFound"
+          if="cant.trust.urlcheck">
+    <echo>Get non-error response for missing URLs</echo>
+  </target>
+
   <target name="testURL"
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=53383">
     <au:assertNestedResourceExists>
-      <url url="http://ant.apache.org/index.html"/>
+      <url url="${existing-url}"/>
     </au:assertNestedResourceExists>
   </target>
 
   <target name="testURLUsingRef"
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=53383">
-    <url url="http://ant.apache.org/index.html" id="antsite"/>
+    <url url="${existing-url}" id="antsite"/>
     <au:assertRefResourceExists refid="antsite"/>
   </target>
 
   <target name="testURL-no"
+          depends="-logWhetherUrlsThatDontExistAreFound"
+          unless="cant.trust.urlcheck"
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=53383">
     <au:assertNestedResourceDoesntExist>
-      <url url="http://ant.apache.org/foo.html"/>
+      <url url="${not-existing-url}"/>
     </au:assertNestedResourceDoesntExist>
   </target>
 
   <target name="testURLUsingRef-no"
+          depends="-logWhetherUrlsThatDontExistAreFound"
+          unless="cant.trust.urlcheck"
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=53383">
-    <url url="http://ant.apache.org/foo.html" id="antsite-foo"/>
+    <url url="${not-existing-url}" id="antsite-foo"/>
     <au:assertRefResourceDoesntExist refid="antsite-foo"/>
   </target>