yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 12:00:04 +02:00
Code Issues Releases Wiki Activity

GP-0: Fix timing issues in tests

Browse source
This commit is contained in:
Dan 2022-08-22 09:52:31 -04:00
parent 92b15fed6e
commit b6b0a416fe
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/watch/DebuggerWatchesProviderTest.java
View file

@ -454,6 +454,8 @@ public class DebuggerWatchesProviderTest extends AbstractGhidraHeadedDebuggerGUI
TraceMemoryOperations mem = tb.trace.getMemoryManager(); TraceMemoryOperations mem = tb.trace.getMemoryManager();
ByteBuffer buf = ByteBuffer.allocate(8); ByteBuffer buf = ByteBuffer.allocate(8);
// Wait for row to settle. TODO: Why is this necessary?
waitForPass(() -> assertEquals(tb.addr(0x00400000), row.getAddress()));
row.setRawValueString("0x1234"); row.setRawValueString("0x1234");
waitForPass(() -> { waitForPass(() -> {
long viewSnap = traceManager.getCurrent().getViewSnap(); long viewSnap = traceManager.getCurrent().getViewSnap();
@ -464,6 +466,8 @@ public class DebuggerWatchesProviderTest extends AbstractGhidraHeadedDebuggerGUI
assertEquals(0x1234, buf.getLong()); assertEquals(0x1234, buf.getLong());
}); });
// Wait for row to settle. TODO: Why is this necessary?
waitForPass(() -> assertEquals(tb.addr(0x00400000), row.getAddress()));
row.setRawValueString("{ 12 34 56 78 9a bc de f0 }"); row.setRawValueString("{ 12 34 56 78 9a bc de f0 }");
waitForPass(() -> { waitForPass(() -> {
long viewSnap = traceManager.getCurrent().getViewSnap(); long viewSnap = traceManager.getCurrent().getViewSnap();

5
Ghidra/Debug/Debugger/src/test/java/ghidra/debug/flatapi/FlatDebuggerAPITest.java
View file

@ -849,6 +849,7 @@ public class FlatDebuggerAPITest extends AbstractGhidraHeadedDebuggerGUITest {
createTestModel(); createTestModel();
mb.createTestProcessesAndThreads(); mb.createTestProcessesAndThreads();
TraceRecorder recorder = record(mb.testProcess1); TraceRecorder recorder = record(mb.testProcess1);
waitRecorder(recorder);
assertTrue(waitOn(recorder.requestFocus(mb.testThread2))); assertTrue(waitOn(recorder.requestFocus(mb.testThread2)));
waitRecorder(recorder); waitRecorder(recorder);
@ -899,6 +900,7 @@ public class FlatDebuggerAPITest extends AbstractGhidraHeadedDebuggerGUITest {
createTestModel(); createTestModel();
mb.createTestProcessesAndThreads(); mb.createTestProcessesAndThreads();
TraceRecorder recorder = record(mb.testProcess1); TraceRecorder recorder = record(mb.testProcess1);
waitRecorder(recorder);
assertTrue(waitOn(recorder.requestFocus(mb.testThread2))); assertTrue(waitOn(recorder.requestFocus(mb.testThread2)));
waitRecorder(recorder); waitRecorder(recorder);
@ -942,6 +944,7 @@ public class FlatDebuggerAPITest extends AbstractGhidraHeadedDebuggerGUITest {
createTestModel(); createTestModel();
mb.createTestProcessesAndThreads(); mb.createTestProcessesAndThreads();
TraceRecorder recorder = record(mb.testProcess1); TraceRecorder recorder = record(mb.testProcess1);
waitRecorder(recorder);
assertTrue(waitOn(recorder.requestFocus(mb.testThread2))); assertTrue(waitOn(recorder.requestFocus(mb.testThread2)));
waitRecorder(recorder); waitRecorder(recorder);
@ -985,6 +988,7 @@ public class FlatDebuggerAPITest extends AbstractGhidraHeadedDebuggerGUITest {
createTestModel(); createTestModel();
mb.createTestProcessesAndThreads(); mb.createTestProcessesAndThreads();
TraceRecorder recorder = record(mb.testProcess1); TraceRecorder recorder = record(mb.testProcess1);
waitRecorder(recorder);
assertTrue(waitOn(recorder.requestFocus(mb.testThread2))); assertTrue(waitOn(recorder.requestFocus(mb.testThread2)));
waitRecorder(recorder); waitRecorder(recorder);
@ -1026,6 +1030,7 @@ public class FlatDebuggerAPITest extends AbstractGhidraHeadedDebuggerGUITest {
createTestModel(); createTestModel();
mb.createTestProcessesAndThreads(); mb.createTestProcessesAndThreads();
TraceRecorder recorder = record(mb.testProcess1); TraceRecorder recorder = record(mb.testProcess1);
waitRecorder(recorder);
assertTrue(waitOn(recorder.requestFocus(mb.testThread2))); assertTrue(waitOn(recorder.requestFocus(mb.testThread2)));
waitRecorder(recorder); waitRecorder(recorder);