mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated the testing code to set the zookeeper host and port

Browse Source
This commit is contained in:
U-BASIS\dsmyda 2020-12-07 14:44:29 -05:00
parent bd5ded3731
commit 6564f83706
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Testing/build.xml
View File

@ -80,6 +80,8 @@
<sysproperty key="crPort" value="${crPort}"/> <sysproperty key="crPort" value="${crPort}"/>
<sysproperty key="crUserName" value="${crUserName}"/> <sysproperty key="crUserName" value="${crUserName}"/>
<sysproperty key="crPassword" value="${crPassword}"/> <sysproperty key="crPassword" value="${crPassword}"/>
<sysproperty key="zooKeeperHost" value="${zooKeeperHost}"/>
<sysproperty key="zooKeeperPort" value="${zooKeeperPort}"/>
<sysproperty key="isMultiUser" value="${isMultiUser}"/> <sysproperty key="isMultiUser" value="${isMultiUser}"/>
<!--needed to have tests NOT to steal focus when running, works in latest apple jdk update only.--> <!--needed to have tests NOT to steal focus when running, works in latest apple jdk update only.-->
<sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/> <sysproperty key="apple.awt.UIElement" value="@{disable.apple.ui}"/>

5
Testing/src/org/sleuthkit/autopsy/testing/AutopsyTestCases.java
View File

@ -1,7 +1,7 @@
/* /*
* Autopsy Forensic Browser * Autopsy Forensic Browser
* *
* Copyright 2011-2018 Basis Technology Corp. * Copyright 2011-2020 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org * Contact: carrier <at> sleuthkit <dot> org
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -463,6 +463,9 @@ public class AutopsyTestCases {
} catch (UserPreferencesException ex) { } catch (UserPreferencesException ex) {
logger.log(Level.SEVERE, "Error saving messaging service connection info", ex); //NON-NLS logger.log(Level.SEVERE, "Error saving messaging service connection info", ex); //NON-NLS
} }
UserPreferences.setZkServerHost(System.getProperty("zooKeeperHost"));
UserPreferences.setZkServerPort(System.getProperty("zooKeeperPort"));
} }
private void expandNodes(JTreeOperator jto, TreePath tp) { private void expandNodes(JTreeOperator jto, TreePath tp) {

6
test/script/regression.py
View File

@ -475,6 +475,8 @@ class TestRunner(object):
test_data.ant.append("-DcrPort=" + str(test_config.crPort)) test_data.ant.append("-DcrPort=" + str(test_config.crPort))
test_data.ant.append("-DcrUserName=" + str(test_config.crUserName)) test_data.ant.append("-DcrUserName=" + str(test_config.crUserName))
test_data.ant.append("-DcrPassword=" + str(test_config.crPassword)) test_data.ant.append("-DcrPassword=" + str(test_config.crPassword))
test_data.ant.append("-DzooKeeperHost=" + str(test_config.zooKeeperHost))
test_data.ant.append("-DzooKeeperPort=" + str(test_config.zooKeeperPort))
if test_data.isMultiUser: if test_data.isMultiUser:
test_data.ant.append("-DisMultiUser=true") test_data.ant.append("-DisMultiUser=true")
# Note: test_data has autopys_version attribute, but we couldn't see it from here. It's set after run ingest. # Note: test_data has autopys_version attribute, but we couldn't see it from here. It's set after run ingest.
@ -866,6 +868,10 @@ class TestConfiguration(object):
self.crUserName = parsed_config.getElementsByTagName("crUserName")[0].getAttribute("value").encode().decode("utf_8") self.crUserName = parsed_config.getElementsByTagName("crUserName")[0].getAttribute("value").encode().decode("utf_8")
if parsed_config.getElementsByTagName("crPassword"): if parsed_config.getElementsByTagName("crPassword"):
self.crPassword = parsed_config.getElementsByTagName("crPassword")[0].getAttribute("value").encode().decode("utf_8") self.crPassword = parsed_config.getElementsByTagName("crPassword")[0].getAttribute("value").encode().decode("utf_8")
if parsed_config.getElementsByTagName("zooKeeperHost"):
self.zooKeeperHost = parsed_config.getElementsByTagName("zooKeeperHost")[0].getAttribute("value").encode().decode("utf_8")
if parsed_config.getElementsByTagName("zooKeeperPort"):
self.zooKeeperPort = parsed_config.getElementsByTagName("zooKeeperPort")[0].getAttribute("value").encode().decode("utf_8")
self._init_imgs(parsed_config) self._init_imgs(parsed_config)
self._init_build_info(parsed_config) self._init_build_info(parsed_config)