[pkg-java] r8833 - trunk/solr/debian/patches

[Jan-Pascal van Best]

Author: janpascal-guest
Date: 2009-07-03 07:40:28 +0000 (Fri, 03 Jul 2009)
New Revision: 8833

Added:
   trunk/solr/debian/patches/08_disable-tests-that-break-on-buildd.dpatch
Removed:
   trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch
Modified:
   trunk/solr/debian/patches/00list
Log:
Remove test with race conditions that breaks on buildds

Modified: trunk/solr/debian/patches/00list
===================================================================
--- trunk/solr/debian/patches/00list	2009-07-03 02:02:00 UTC (rev 8832)
+++ trunk/solr/debian/patches/00list	2009-07-03 07:40:28 UTC (rev 8833)
@@ -1,7 +1,7 @@
 01_remove-all-jarfiles.dpatch
 04_fix-lucene-lock-directory.dpatch
 05_use-debian-java-libraries.dpatch
-08_disable-tests-that-need-network-access.dpatch
+08_disable-tests-that-break-on-buildd.dpatch
 10_contrib-dataimporthandler-use-debian-libs.dpatch
 15_fix-failed-test-with-new-jetty.dpatch
 16_fix-failed-SolrInfoMBeanTest.dpatch

Copied: trunk/solr/debian/patches/08_disable-tests-that-break-on-buildd.dpatch (from rev 8749, trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch)
===================================================================
--- trunk/solr/debian/patches/08_disable-tests-that-break-on-buildd.dpatch	                        (rev 0)
+++ trunk/solr/debian/patches/08_disable-tests-that-break-on-buildd.dpatch	2009-07-03 07:40:28 UTC (rev 8833)
@@ -0,0 +1,68 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_disable-tests-that-need-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 tests that need network access, because they fail for (some of)
+## DP: the autobuilders
+
+ at DPATCH@
+diff -urNad solr~/src/test/org/apache/solr/common/util/ContentStreamTest.java solr/src/test/org/apache/solr/common/util/ContentStreamTest.java
+--- solr~/src/test/org/apache/solr/common/util/ContentStreamTest.java	2009-07-03 09:38:05.000000000 +0200
++++ solr/src/test/org/apache/solr/common/util/ContentStreamTest.java	2009-07-03 09:38:06.000000000 +0200
+@@ -55,7 +55,7 @@
+     assertTrue( IOUtils.contentEquals( new FileReader(      file ), stream.getReader() ) );
+   }
+   
+-
++/* Disabled for Debian build because this test needs network access
+   public void testURLStream() throws IOException 
+   {
+     String content = null;
+@@ -87,4 +87,5 @@
+     stream = new ContentStreamBase.URLStream( url );
+     assertTrue( IOUtils.contentEquals( new StringReader( content ), stream.getReader() ) );
+   }
++*/
+ }
+diff -urNad solr~/src/test/org/apache/solr/servlet/SolrRequestParserTest.java solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
+--- solr~/src/test/org/apache/solr/servlet/SolrRequestParserTest.java	2009-07-03 09:38:05.000000000 +0200
++++ solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java	2009-07-03 09:38:06.000000000 +0200
+@@ -95,7 +95,7 @@
+     }
+   }
+   
+-
++/* Disabled for Debian builds because this test needs network access
+   public void testStreamURL() throws Exception
+   {
+     boolean ok = false;
+@@ -121,7 +121,7 @@
+     assertEquals( 1, streams.size() );
+     assertEquals( txt, IOUtils.toString( streams.get(0).getStream() ) );
+   }
+-  
++*/ 
+   public void testUrlParamParsing()
+   {
+     String[][] teststr = new String[][] {
+diff -urNad solr~/src/test/org/apache/solr/update/AutoCommitTest.java solr/src/test/org/apache/solr/update/AutoCommitTest.java
+--- solr~/src/test/org/apache/solr/update/AutoCommitTest.java	2008-08-27 15:04:04.000000000 +0200
++++ solr/src/test/org/apache/solr/update/AutoCommitTest.java	2009-07-03 09:39:14.000000000 +0200
+@@ -83,6 +83,8 @@
+ 
+   /* This test is causing too many failures on one of the build slaves.
+      Temporarily disabled. -Mike Klaas */
++/* Commented out for Debian builds. Apparently some of the buildd's try to
++ * perform this test anyway (and break)
+   public void XXXtestMaxDocs() throws Exception {
+ 
+     CommitListener trigger = new CommitListener();
+@@ -128,7 +130,7 @@
+     assertEquals( 1, tracker.getCommitCount());
+     
+   }
+-
++*/
+   public void testMaxTime() throws Exception {
+     CommitListener trigger = new CommitListener();
+     SolrCore core = h.getCore();


Property changes on: trunk/solr/debian/patches/08_disable-tests-that-break-on-buildd.dpatch
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mergeinfo
   + 

Deleted: trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch
===================================================================
--- trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch	2009-07-03 02:02:00 UTC (rev 8832)
+++ trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch	2009-07-03 07:40:28 UTC (rev 8833)
@@ -1,47 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_disable-tests-that-need-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 tests that need network access, because they fail for (some of)
-## DP: the autobuilders
-
- at DPATCH@
-diff -urNad solr~/src/test/org/apache/solr/common/util/ContentStreamTest.java solr/src/test/org/apache/solr/common/util/ContentStreamTest.java
---- solr~/src/test/org/apache/solr/common/util/ContentStreamTest.java	2009-07-02 09:27:43.000000000 +0200
-+++ solr/src/test/org/apache/solr/common/util/ContentStreamTest.java	2009-07-02 09:27:44.000000000 +0200
-@@ -55,7 +55,7 @@
-     assertTrue( IOUtils.contentEquals( new FileReader(      file ), stream.getReader() ) );
-   }
-   
--
-+/* Disabled for Debian build because this test needs network access
-   public void testURLStream() throws IOException 
-   {
-     String content = null;
-@@ -87,4 +87,5 @@
-     stream = new ContentStreamBase.URLStream( url );
-     assertTrue( IOUtils.contentEquals( new StringReader( content ), stream.getReader() ) );
-   }
-+*/
- }
-diff -urNad solr~/src/test/org/apache/solr/servlet/SolrRequestParserTest.java solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
---- solr~/src/test/org/apache/solr/servlet/SolrRequestParserTest.java	2009-07-02 09:27:43.000000000 +0200
-+++ solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java	2009-07-02 09:27:44.000000000 +0200
-@@ -95,7 +95,7 @@
-     }
-   }
-   
--
-+/* Disabled for Debian builds because this test needs network access
-   public void testStreamURL() throws Exception
-   {
-     boolean ok = false;
-@@ -121,7 +121,7 @@
-     assertEquals( 1, streams.size() );
-     assertEquals( txt, IOUtils.toString( streams.get(0).getStream() ) );
-   }
--  
-+*/ 
-   public void testUrlParamParsing()
-   {
-     String[][] teststr = new String[][] {