[knox] branch master updated: KNOX-2846 - Fix GatewayWebsocketHandlerTest.testValidWebShellRequest (#685)

[amagyar]

This is an automated email from the ASF dual-hosted git repository.

amagyar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git


The following commit(s) were added to refs/heads/master by this push:
     new 041aebf26 KNOX-2846 - Fix 
GatewayWebsocketHandlerTest.testValidWebShellRequest (#685)
041aebf26 is described below

commit 041aebf26e8d8b4c0a3fba367688b4447085e4a6
Author: Attila Magyar <m.magy...@gmail.com>
AuthorDate: Mon Nov 28 15:51:51 2022 +0100

    KNOX-2846 - Fix GatewayWebsocketHandlerTest.testValidWebShellRequest (#685)
---
 .../apache/knox/gateway/websockets/GatewayWebsocketHandlerTest.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/GatewayWebsocketHandlerTest.java
 
b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/GatewayWebsocketHandlerTest.java
index 3cca6af6d..7cd3f6408 100644
--- 
a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/GatewayWebsocketHandlerTest.java
+++ 
b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/GatewayWebsocketHandlerTest.java
@@ -33,12 +33,12 @@ import 
org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
 import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
@@ -47,6 +47,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", 
"javax.management.*", "org.w3c.*"})
 @PrepareForTest({JWTValidatorFactory.class, MessagesFactory.class, 
GatewayWebsocketHandler.class, AuditServiceFactory.class})
 public class GatewayWebsocketHandlerTest {
     @BeforeClass
@@ -67,8 +68,6 @@ public class GatewayWebsocketHandlerTest {
         EasyMock.replay(auditService,auditor);
     }
 
-
-    @Ignore("KNOX-2846 - Temporary ignoring until it's fixed in a way such as 
it passes GH runs too 100%")
     @Test
     public void testValidWebShellRequest() throws Exception{
         // mock GatewayConfig and GatewayServices