This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch wheezy-backports in repository tomcat7.
commit e905cda74e6be0760df4a3e2813f100e65d0e797 Author: Emmanuel Bourg <[email protected]> Date: Wed Dec 10 14:57:31 2014 +0100 Added a patch to build the tests with the version of junit4 in wheezy --- debian/changelog | 1 + debian/patches/0099-junit-compatibility.patch | 103 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 105 insertions(+) diff --git a/debian/changelog b/debian/changelog index 740f71d..3465070 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ tomcat7 (7.0.56-1~bpo70+1) wheezy-backports; urgency=low * Rebuild for wheezy-backports - Loosened the versioned dependency on libhamcrest-java (>= 1.2) + - Added a patch to build the tests with the version of junit4 in wheezy -- Emmanuel Bourg <[email protected]> Wed, 10 Dec 2014 14:07:42 +0100 diff --git a/debian/patches/0099-junit-compatibility.patch b/debian/patches/0099-junit-compatibility.patch new file mode 100644 index 0000000..c4acbe7 --- /dev/null +++ b/debian/patches/0099-junit-compatibility.patch @@ -0,0 +1,103 @@ +Description: Modify the tests to build with the version of junit in wheezy +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/test/org/apache/tomcat/util/net/TestSsl.java ++++ b/test/org/apache/tomcat/util/net/TestSsl.java +@@ -157,7 +157,7 @@ + public void testRenegotiateWorks() throws Exception { + Tomcat tomcat = getTomcatInstance(); + +- Assume.assumeTrue("SSL renegotiation has to be supported for this test", ++ Assume.assumeTrue(//"SSL renegotiation has to be supported for this test", + TesterSupport.isRenegotiationSupported(getTomcatInstance())); + + File appDir = new File(getBuildDirectory(), "webapps/examples"); +--- a/test/org/apache/catalina/comet/TestCometProcessor.java ++++ b/test/org/apache/catalina/comet/TestCometProcessor.java +@@ -53,7 +53,7 @@ + @Test + public void testAsyncClose() throws Exception { + Assume.assumeTrue( +- "This test is skipped, because this connector does not support Comet.", ++ //"This test is skipped, because this connector does not support Comet.", + isCometSupported()); + + // Setup Tomcat instance +@@ -120,7 +120,7 @@ + @Test + public void testSyncClose() throws Exception { + Assume.assumeTrue( +- "This test is skipped, because this connector does not support Comet.", ++ //"This test is skipped, because this connector does not support Comet.", + isCometSupported()); + + // Setup Tomcat instance +@@ -191,7 +191,7 @@ + @Ignore("fails consistently on Debian/Linux") + public void testConnectionClose() throws Exception { + Assume.assumeTrue( +- "This test is skipped, because this connector does not support Comet.", ++ //"This test is skipped, because this connector does not support Comet.", + isCometSupported()); + + // Setup Tomcat instance +@@ -264,7 +264,7 @@ + + private void doSimpleCometTest(String initParam) throws Exception { + Assume.assumeTrue( +- "This test is skipped, because this connector does not support Comet.", ++ //"This test is skipped, because this connector does not support Comet.", + isCometSupported()); + + // Setup Tomcat instance +@@ -358,7 +358,7 @@ + @Test + public void testCometConnectorStop() throws Exception { + Assume.assumeTrue( +- "This test is skipped, because this connector does not support Comet.", ++ //"This test is skipped, because this connector does not support Comet.", + isCometSupported()); + + // Setup Tomcat instance +--- a/test/org/apache/tomcat/util/net/TestClientCert.java ++++ b/test/org/apache/tomcat/util/net/TestClientCert.java +@@ -46,7 +46,7 @@ + } + + private void doTestClientCertGet(boolean preemtive) throws Exception { +- Assume.assumeTrue("SSL renegotiation has to be supported for this test", ++ Assume.assumeTrue(//"SSL renegotiation has to be supported for this test", + TesterSupport.isRenegotiationSupported(getTomcatInstance())); + + if (preemtive) { +@@ -96,7 +96,7 @@ + + private void doTestClientCertPost(int bodySize, boolean expectProtectedFail) + throws Exception { +- Assume.assumeTrue("SSL renegotiation has to be supported for this test", ++ Assume.assumeTrue(//"SSL renegotiation has to be supported for this test", + TesterSupport.isRenegotiationSupported(getTomcatInstance())); + + getTomcatInstance().start(); +--- a/test/org/apache/tomcat/util/net/TestCustomSsl.java ++++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java +@@ -51,8 +51,8 @@ + Tomcat tomcat = getTomcatInstance(); + Connector connector = tomcat.getConnector(); + +- Assume.assumeFalse("This test is only for JSSE based SSL connectors", +- connector.getProtocolHandlerClassName().contains("Apr")); ++ Assume.assumeTrue(//"This test is only for JSSE based SSL connectors", ++ !connector.getProtocolHandlerClassName().contains("Apr")); + + connector.setProperty("sslImplementationName", + "org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl"); +@@ -99,7 +99,7 @@ + + Tomcat tomcat = getTomcatInstance(); + +- Assume.assumeTrue("SSL renegotiation has to be supported for this test", ++ Assume.assumeTrue(//"SSL renegotiation has to be supported for this test", + TesterSupport.isRenegotiationSupported(getTomcatInstance())); + + TesterSupport.configureClientCertContext(tomcat); diff --git a/debian/patches/series b/debian/patches/series index 5ac9335..02a32bb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,3 +15,4 @@ 0019-add-distribution-to-error-page.patch 0020-disable-java8-support-with-jdtcompiler.patch 0021-add-simple-instance-manager.patch +0099-junit-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
