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

Tests - added debug for timing issue

Browse Source
This commit is contained in:
dragonmacher
2019-08-14 11:14:05 -04:00
parent 8ead356765
commit cf238325a3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/test.slow/java/ghidra/app/merge/listing/AbstractListingMergeManagerTest.java
+6 -1
View File
@@ -50,6 +50,7 @@ import ghidra.program.model.mem.*;
import ghidra.program.model.symbol.*;
import ghidra.program.model.util.CodeUnitInsertionException;
import ghidra.program.util.*;
import ghidra.util.Msg;
import ghidra.util.exception.*;
import ghidra.util.task.TaskMonitor;
@@ -729,7 +730,11 @@ public abstract class AbstractListingMergeManagerTest extends AbstractMergeTest
Component mergePanel = getMergePanel(conflictPanelClass);
assertNotNull("Timed-out waiting for merge panel", mergePanel);
Window window = SwingUtilities.getWindowAncestor(mergePanel);
assertNotNull("Timed-out waiting for merge panel", mergePanel);
if (window == null) {
Msg.debug(this, "Unable to find conflict panel window for '" + conflictTitle + "'");
printOpenWindows();
}
assertNotNull("Timed-out waiting for merge panel", window);
JComponent comp = findComponent(window, conflictPanelClass);
assertNotNull(comp);
Border border = comp.getBorder();