This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 0f017644bc Fix backport
0f017644bc is described below
commit 0f017644bc388015a4488d8ffb73e3af7e0f60bd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 22 13:42:04 2023 +0100
Fix backport
---
test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
index 50254a666b..bfb63bf80b 100644
--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
+++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
@@ -121,11 +121,7 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
}
-<<<<<<< HEAD
- @Test(expected = javax.websocket.DeploymentException.class)
-=======
@Test(expected = DeploymentException.class)
->>>>>>> dd9262f4c4 (Remove unnecessary use of FQCN)
public void testConnectToServerEndpointNoHost() throws Exception {
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
