mirror of
https://github.com/NationalSecurityAgency/ghidra
synced 2024-08-27 21:10:26 +00:00
Tests - increased merge tests timeout to avoid timeouts in parallel mode
This commit is contained in:
parent
0e83fdbe70
commit
458b02e65d
|
@ -15,8 +15,7 @@
|
|||
*/
|
||||
package ghidra.app.merge;
|
||||
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.fail;
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.ArrayList;
|
||||
|
@ -41,7 +40,7 @@ import ghidra.util.Msg;
|
|||
public abstract class AbstractMergeTest extends AbstractGhidraHeadedIntegrationTest {
|
||||
|
||||
// TODO this may need to be modified for parallel mode
|
||||
protected static final int MAX_MERGE_TIMEOUT = 10000;
|
||||
protected static final int MAX_MERGE_TIMEOUT = 20000;
|
||||
|
||||
protected MergeTestFacilitator mtf;
|
||||
protected Program originalProgram;
|
||||
|
|
Loading…
Reference in a new issue