Author: markt
Date: Wed Nov 25 11:52:11 2015
New Revision: 1716364
URL: http://svn.apache.org/viewvc?rev=1716364&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58650
Use class level @Ignore if all tests are to be ignored to avoid generation of
directory named '${catalina.base}'
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestConnectionLimit.java
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestConnectionLimit.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestConnectionLimit.java?rev=1716364&r1=1716363&r2=1716364&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestConnectionLimit.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestConnectionLimit.java Wed
Nov 25 11:52:11 2015
@@ -34,15 +34,14 @@ import org.apache.catalina.startup.Tomca
import org.apache.catalina.startup.TomcatBaseTest;
import
org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint;
-
-public class TestConnectionLimit extends TomcatBaseTest{
+@Ignore // Not for use in normal unit test runs
+public class TestConnectionLimit extends TomcatBaseTest {
/*
* Simple test to see how many outgoing connections can be created on a
* single machine.
*/
@Test
- @Ignore // Not for use in normal unit test runs
public void testSingleMachine() throws Exception {
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java?rev=1716364&r1=1716363&r2=1716364&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
Wed Nov 25 11:52:11 2015
@@ -48,6 +48,7 @@ import org.apache.catalina.startup.Tomca
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.websocket.pojo.TesterUtil.SimpleClient;
+@Ignore // This test requires manual intervention to create breakpoints etc.
public class TestWsRemoteEndpointImplServer extends TomcatBaseTest {
/*
@@ -68,7 +69,6 @@ public class TestWsRemoteEndpointImplSer
* the call to sendObject(). If the issue is fixed, the thread at
breakpoint
* B will continue past sendObject() and terminate with a TimeoutException.
*/
- @Ignore // This test requires manual intervention to create breakpoints
etc.
@Test
public void testClientDropsConnection() throws Exception {
Tomcat tomcat = getTomcatInstance();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
