From aa7406499867301165c09e50faee0d7565b2505f Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Tue, 17 Nov 2020 16:27:41 -0500 Subject: [PATCH] Bug fixes --- .../datamodel/CentralRepoDbManager.java | 4 +--- .../sleuthkit/autopsy/testing/RegressionTest.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDbManager.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDbManager.java index 30db75bcdc..d07ae1ef24 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDbManager.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDbManager.java @@ -383,9 +383,7 @@ public class CentralRepoDbManager { saveNewCentralRepo(); } - public void setupPostgresDb(CentralRepoDbChoice choice) throws CentralRepoException { - assert UserPreferences.getIsMultiUserModeEnabled(); - + public void setupPostgresDb(CentralRepoDbChoice choice) throws CentralRepoException { selectedDbChoice = choice; DatabaseTestResult curStatus = testStatus(); if (curStatus == DatabaseTestResult.DB_DOES_NOT_EXIST) { 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 925b3b881a..b018e4a60a 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 @@ -105,12 +105,14 @@ public class RegressionTest extends TestCase { Timeouts.setDefault("ComponentOperator.WaitComponentTimeout", 1000000); try { - CentralRepoDbManager manager = new CentralRepoDbManager(); - manager.getDbSettingsPostgres().setHost(System.getProperty("crHost")); - manager.getDbSettingsPostgres().setPort(Integer.parseInt(System.getProperty("crPort"))); - manager.getDbSettingsPostgres().setUserName(System.getProperty("crUserName")); - manager.getDbSettingsPostgres().setPassword(System.getProperty("crPassword")); - manager.setupPostgresDb(CentralRepoDbChoice.POSTGRESQL_CUSTOM); + if (Boolean.parseBoolean(System.getProperty("isMultiUser"))) { + CentralRepoDbManager manager = new CentralRepoDbManager(); + manager.getDbSettingsPostgres().setHost(System.getProperty("crHost")); + manager.getDbSettingsPostgres().setPort(Integer.parseInt(System.getProperty("crPort"))); + manager.getDbSettingsPostgres().setUserName(System.getProperty("crUserName")); + manager.getDbSettingsPostgres().setPassword(System.getProperty("crPassword")); + manager.setupPostgresDb(CentralRepoDbChoice.POSTGRESQL_CUSTOM); + } } catch (CentralRepoException ex) { throw new RuntimeException("Error setting up multi user CR", ex); }