Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-27 20:00:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1_ghidragon_test_fixes_4_22_26'

Browse Source
This commit is contained in:
ghidra1
2026-05-04 14:53:08 -04:00
parent ff0789ff16 2f2b76910f
commit 39c3a2dad1
45 changed files with 1976 additions and 688 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/client/GhidraServerSerialFilterFailureTest.java
+3 -5
View File
@@ -19,7 +19,6 @@ import static org.junit.Assert.*;
import java.io.File;
import java.io.InvalidClassException;
import java.rmi.RemoteException;
import java.rmi.UnmarshalException;
import java.security.Principal;
import java.util.HashSet;
@@ -117,11 +116,10 @@ public class GhidraServerSerialFilterFailureTest extends AbstractGhidraHeadlessI
serverHandle.getRepositoryServer(getBogusUserSubject(), new Callback[0]);
fail("serial filter rejection failed to perform");
}
catch (RemoteException e) {
catch (Exception e) {
Throwable cause = e.getCause();
assertTrue("expected remote unmarshall exception", cause instanceof UnmarshalException);
cause = cause.getCause();
assertTrue("expected remote invalid class exceptionn",
assertTrue("Expected remote unmarshall exception", e instanceof UnmarshalException);
assertTrue("Expected remote invalid class exceptionn",
cause instanceof InvalidClassException);
}
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/server/remote/ServerTestUtil.java
-2
View File
@@ -528,8 +528,6 @@ public class ServerTestUtil {
Thread.sleep(200);
if (isServerRegistered(portFactory.getRMIRegistryPort()) &&
canConnect(portFactory.getRMISSLPort())) {
Msg.info(ServerTestUtil.class,
"Successfully verified Ghidra Server registration and SSL port availability");
success = true;
return;
}