← Back to branch summary

~yolanda.robla/ubuntu/trusty/tomcat7/add_distribution_static_right_author

« back to all changes in this revision

Viewing changes to debian/patches/0015_disable_test_TestCometProcessor.patch

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-02-20 15:34:18 UTC
  • mfrom: (1.1.12) (11.1.11 experimental)
  • Revision ID: package-import@ubuntu.com-20130220153418-7tbda1w2o280qmce
Tags: 7.0.35-1~exp1ubuntu1
* Merge from Debian experimental, remaining changes:
  + Enabled Tomcat jdbc-pool module, aligning more closely to upstream and
    providing improved multi-threaded performance over commons-dbcp:
    - d/rules,d/libtomcat7-java.poms: Install tomcat-dbcp.jar file.
    - d/patches/0005-change-default-DBCP-factory-class.patch: Drop patch
      which switches the default DBCP factory to commons-dbcp.
    - d/p/0015-use-jdbc-pool-default.patch: Make jdbc-pool module the
      default pool implementation for DataSources.
    - d/NEWS: let users know about this change.
* Dropped changes, included in Debian:
  - d/p/0014-fix-override.patch: Fix FTBFS due to differing dependency
    versions compared to upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0015_disable_test_TestCometProcessor.patch
 
1
--- a/test/org/apache/catalina/comet/TestCometProcessor.java
 
2
+++ b/test/org/apache/catalina/comet/TestCometProcessor.java
 
3
@@ -29,6 +29,7 @@
 
4
 import javax.servlet.http.HttpSession;
 
5
 
 
6
 import junit.framework.Assert;
 
7
+import org.junit.Ignore;
 
8
 
 
9
 import static org.junit.Assert.assertEquals;
 
10
 import static org.junit.Assert.assertTrue;
 
11
@@ -192,6 +193,7 @@
 
12
     }
 
13
 
 
14
     @Test
 
15
+    @Ignore("fails consistently on Debian/Linux")
 
16
     public void testConnectionClose() throws Exception {
 
17
 
 
18
         if (!isCometSupported()) {