From 1a5f03721918c9e5aaff0b4a2cfdf83ae8894f6d Mon Sep 17 00:00:00 2001
From: "U-BASIS\\dsmyda" <dsmyda@win-dsmyd-2925.basistech.net>
Date: Tue, 1 Dec 2020 11:44:03 -0500
Subject: [PATCH] Fixed nightly deadlock by moving the CR setup code to run
 once per regression test run (before case creation and ingest)

---
 .../sleuthkit/autopsy/testing/RegressionTest.java  | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Testing/test/qa-functional/src/org/sleuthkit/autopsy/testing/RegressionTest.java b/Testing/test/qa-functional/src/org/sleuthkit/autopsy/testing/RegressionTest.java
index f2aa476590..eaad6b9714 100644
--- a/Testing/test/qa-functional/src/org/sleuthkit/autopsy/testing/RegressionTest.java
+++ b/Testing/test/qa-functional/src/org/sleuthkit/autopsy/testing/RegressionTest.java
@@ -63,7 +63,9 @@ public class RegressionTest extends TestCase {
                 clusters(".*").
                 enableModules(".*");
         if (img_path.isFile()) {
-            conf = conf.addTest("testNewCaseWizardOpen",
+            conf = conf.addTest(
+                    "testConfigureCustomCR",
+                    "testNewCaseWizardOpen",
                     "testNewCaseWizard",
                     "testStartAddImageFileDataSource",
                     "testConfigureIngest1",
@@ -78,7 +80,9 @@ public class RegressionTest extends TestCase {
         }
 
         if (img_path.isDirectory()) {
-            conf = conf.addTest("testNewCaseWizardOpen",
+            conf = conf.addTest(
+                    "testConfigureCustomCR",
+                    "testNewCaseWizardOpen",
                     "testNewCaseWizard",
                     "testStartAddLogicalFilesDataSource",
                     "testConfigureIngest1",
@@ -103,7 +107,11 @@ public class RegressionTest extends TestCase {
     public void setUp() {
         logger.info("########  " + AutopsyTestCases.getEscapedPath(System.getProperty("img_path")) + "  #######");
         Timeouts.setDefault("ComponentOperator.WaitComponentTimeout", 1000000);
-        
+    }
+    
+    public void testConfigureCustomCR() {
+        // Configure a custom CR before proceeding with the test (and creating
+        // a case).
         try {
             if (Boolean.parseBoolean(System.getProperty("isMultiUser"))) {
                 // Set up a custom postgres CR using the configuration passed