mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-06 21:00:22 +00:00
Fixed nightly deadlock by moving the CR setup code to run once per regression test run (before case creation and ingest)
This commit is contained in:
parent
66d4df9b21
commit
1a5f037219
@ -63,7 +63,9 @@ public class RegressionTest extends TestCase {
|
|||||||
clusters(".*").
|
clusters(".*").
|
||||||
enableModules(".*");
|
enableModules(".*");
|
||||||
if (img_path.isFile()) {
|
if (img_path.isFile()) {
|
||||||
conf = conf.addTest("testNewCaseWizardOpen",
|
conf = conf.addTest(
|
||||||
|
"testConfigureCustomCR",
|
||||||
|
"testNewCaseWizardOpen",
|
||||||
"testNewCaseWizard",
|
"testNewCaseWizard",
|
||||||
"testStartAddImageFileDataSource",
|
"testStartAddImageFileDataSource",
|
||||||
"testConfigureIngest1",
|
"testConfigureIngest1",
|
||||||
@ -78,7 +80,9 @@ public class RegressionTest extends TestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (img_path.isDirectory()) {
|
if (img_path.isDirectory()) {
|
||||||
conf = conf.addTest("testNewCaseWizardOpen",
|
conf = conf.addTest(
|
||||||
|
"testConfigureCustomCR",
|
||||||
|
"testNewCaseWizardOpen",
|
||||||
"testNewCaseWizard",
|
"testNewCaseWizard",
|
||||||
"testStartAddLogicalFilesDataSource",
|
"testStartAddLogicalFilesDataSource",
|
||||||
"testConfigureIngest1",
|
"testConfigureIngest1",
|
||||||
@ -103,7 +107,11 @@ public class RegressionTest extends TestCase {
|
|||||||
public void setUp() {
|
public void setUp() {
|
||||||
logger.info("######## " + AutopsyTestCases.getEscapedPath(System.getProperty("img_path")) + " #######");
|
logger.info("######## " + AutopsyTestCases.getEscapedPath(System.getProperty("img_path")) + " #######");
|
||||||
Timeouts.setDefault("ComponentOperator.WaitComponentTimeout", 1000000);
|
Timeouts.setDefault("ComponentOperator.WaitComponentTimeout", 1000000);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testConfigureCustomCR() {
|
||||||
|
// Configure a custom CR before proceeding with the test (and creating
|
||||||
|
// a case).
|
||||||
try {
|
try {
|
||||||
if (Boolean.parseBoolean(System.getProperty("isMultiUser"))) {
|
if (Boolean.parseBoolean(System.getProperty("isMultiUser"))) {
|
||||||
// Set up a custom postgres CR using the configuration passed
|
// Set up a custom postgres CR using the configuration passed
|
||||||
|
Loading…
x
Reference in New Issue
Block a user