[lucene2] 59/104: Re-enable Highlighter unit test because it no longer causes network access

[Kai-Chung Yan]

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository lucene2.

commit 2cc79ea07714943bedf54332993590e6eb27dece
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date:   Tue Nov 25 12:23:18 2008 +0000

    Re-enable Highlighter unit test because it no longer causes network access
---
 debian/changelog                                |  7 ++++++
 debian/patches/00list                           |  1 -
 debian/patches/81_prevent-network-access.dpatch | 29 -------------------------
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb26fd6..4c81d19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lucene2 (2.4.0+ds1-3) unstable; urgency=low
+
+  * Re-enable Highlighter unit test because it no longer causes network access
+    (Closes: 50678).
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 25 Nov 2008 11:01:26 +0100
+
 lucene2 (2.4.0+ds1-2) unstable; urgency=low
 
   * switch to libdb4.6-java as we need the armel binary of it since OOo/armel
diff --git a/debian/patches/00list b/debian/patches/00list
index db62a9b..3605a22 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -8,4 +8,3 @@
 61_lucli-script.dpatch
 70_fix-contrib-regex-libs.dpatch
 80_prevent-downloading-data-files.dpatch
-81_prevent-network-access.dpatch
diff --git a/debian/patches/81_prevent-network-access.dpatch b/debian/patches/81_prevent-network-access.dpatch
deleted file mode 100755
index 7203de1..0000000
--- a/debian/patches/81_prevent-network-access.dpatch
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 81_prevent-network-access.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disable one of the tests in contrib/highlighter. It seems the XML parser
-## DP: resolves the DTD or xmlns address, causing network access which can cause
-## DP: trouble when running automated builds.
-
- at DPATCH@
-diff -urNad lucene2~/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java lucene2/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
---- lucene2~/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java	2008-09-18 19:03:28.000000000 +0200
-+++ lucene2/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java	2008-09-23 17:31:55.000000000 +0200
-@@ -975,6 +975,8 @@
-    * 
-    * @throws Exception
-    */
-+
-+  /* Disabled for Debian packaging, causes network access during builds
-   public void testEncoding() throws Exception {
- 
-     String rawDocContent = "\"Smith & sons' prices < 3 and >4\" claims article";
-@@ -1014,6 +1016,7 @@
-     String decodedSnippet = h2.getFirstChild().getNodeValue();
-     assertEquals("XHTML Encoding should have worked:", rawDocContent, decodedSnippet);
-   }
-+  */
- 
-   public void testMultiSearcher() throws Exception {
-     // setup index 1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git