\
\
"
# For each error we have logged in the case
@@ -1234,7 +1288,7 @@ def generate_html():
# Links to the logs
logs = "
\
\
-
"
+
"
logs_path = Emailer.make_local_path(case.output_dir, case.image_name, "logs")
for file in os.listdir(logs_path):
logs += "
" + file + "
"
@@ -1243,7 +1297,7 @@ def generate_html():
# All the testing information
info = "
\
\
-
\
+
\
"
# The individual elements
info += "| Image Path: | "
@@ -1332,13 +1386,14 @@ def write_html_head():
h1 span { font-size: 12px; font-weight: 100; }\
h2 { font-family: Tahoma; padding: 0px; margin: 0px; }\
hr { width: 100%; height: 1px; border: none; margin-top: 10px; margin-bottom: 10px; }\
- #errors { background: #FFCFCF; border: 1px solid #FF0000; color: #FF0000; padding: 10px; margin: 20px; }\
- #info { background: #D2D3FF; border: 1px solid #0005FF; color: #0005FF; padding: 10px; margin: 20px; }\
+ #errors { background: #CCCCCC; border: 1px solid #282828; color: #282828; padding: 10px; margin: 20px; }\
+ #errors1 { background: #CC0000; border: 1px solid #282828; color: #282828; padding: 10px; margin: 20px; }\
+ #info { background: #CCCCCC; border: 1px solid #282828; color: #282828; padding: 10px; margin: 20px; }\
#general { background: #CCCCCC; border: 1px solid #282828; color: #282828; padding: 10px; margin: 20px; }\
- #logs { background: #8cff97; border: 1px solid #00820c; color: #00820c; padding: 10px; margin: 20px; }\
+ #logs { background: #CCCCCC; border: 1px solid #282828; color: #282828; padding: 10px; margin: 20px; }\
#errors p, #info p, #general p, #logs p { pading: 0px; margin: 0px; margin-left: 5px; }\
- #info table td { color: #0005FF; font-size: 12px; min-width: 225px; }\
- #logs a { color: #00820c; }\
+ #info table td { color: ##282828; font-size: 12px; min-width: 225px; }\
+ #logs a { color: ##282828; }\
\
"
html.write(head)
@@ -1361,7 +1416,7 @@ def html_add_images(full_image_names):
links = []
for full_name in full_image_names:
name = case.get_image_name(full_name)
- links.append("" + name + "")
+ links.append("" + name + "")
html.write("" + (" | ".join(links)) + "
")
@@ -1538,6 +1593,7 @@ Options:
-e ex Prints out all errors containing ex.
-l cfg Runs from configuration file cfg.
-c Runs in a loop over the configuration file until canceled. Must be used in conjunction with -l
+ -fr Will not try download gold standard images
"""
@@ -1587,6 +1643,8 @@ def execute_test():
global failedbool
global html
global attachl
+ if(not dir_exists(Emailer.make_path("..", "output", "results"))):
+ os.makedirs(Emailer.make_path("..", "output", "results",))
case.output_dir = Emailer.make_path("..", "output", "results", time.strftime("%Y.%m.%d-%H.%M.%S"))
os.makedirs(case.output_dir)
case.common_log = "AutopsyErrors.txt"
@@ -1626,6 +1684,8 @@ def execute_test():
logres = search_common_log("TskCoreException")
if (len(logres)>0):
failedbool = True
+ global imgfail
+ imgfail = True
global errorem
errorem += "Autopsy Nightly test failed.\n"
passFail = False
@@ -1633,6 +1693,7 @@ def execute_test():
errorem += lm
html.close()
if failedbool:
+ passFail = False
attachl.append(case.common_log_path)
attachl.insert(0, html.name)
else:
@@ -1641,7 +1702,7 @@ def execute_test():
passFail = True
attachl = []
if not args.gold_creation:
- Emailer.send_email(parsed, errorem, attachl, html)
+ Emailer.send_email(parsed, errorem, attachl, passFail)
def secs_till_tommorow():
seconds = (23*3600)-(int(strftime("%H", localtime()))*3600)
@@ -1664,17 +1725,6 @@ def main():
global daycount
global redo
global passed
- inpvar = raw_input("Your input images may be out of date, do you want to update?(y/n): ")
- if(inpvar.lower() == 'y' or inpvar.lower() == 'yes'):
- antin = ["ant"]
- antin.append("-f")
- antin.append(os.path.join("..","..","build.xml"))
- antin.append("test-download-imgs")
- if SYS is OS.CYGWIN:
- subprocess.call(antin)
- elif SYS is OS.WIN:
- theproc = subprocess.Popen(antin, shell = True, stdout=subprocess.PIPE)
- theproc.communicate()
daycount = 0
failedbool = False
redo = False
@@ -1688,21 +1738,29 @@ def main():
# The arguments were given wrong:
if not args.parse():
case.reset()
- pass
+ return
+ if(not args.fr):
+ antin = ["ant"]
+ antin.append("-f")
+ antin.append(os.path.join("..","..","build.xml"))
+ antin.append("test-download-imgs")
+ if SYS is OS.CYGWIN:
+ subprocess.call(antin)
+ elif SYS is OS.WIN:
+ theproc = subprocess.Popen(antin, shell = True, stdout=subprocess.PIPE)
+ theproc.communicate()
# Otherwise test away!
- else:
+ execute_test()
+ if(args.daily and args.contin):
+ time.sleep(secs_till_tommorow())
+ while args.contin:
+ redo = False
+ attachl = []
+ errorem = "The test standard didn't match the gold standard.\n"
+ failedbool = False
+ passed = False
execute_test()
- if(args.daily and args.contin):
- time.sleep(secs_till_tommorow())
- while args.contin:
- redo = False
- attachl = []
- errorem = "The test standard didn't match the gold standard.\n"
- failedbool = False
- passed = False
- execute_test()
- case = TestAutopsy()
-
+ case = TestAutopsy()
class OS:
LINUX, MAC, WIN, CYGWIN = range(4)
diff --git a/test/input/NSRL.txt-md5.idx b/test/input/NSRL.txt-md5.idx
new file mode 100644
index 0000000000..53dec81bc6
--- /dev/null
+++ b/test/input/NSRL.txt-md5.idx
@@ -0,0 +1,6 @@
+00000000000000000000000000000000000000000|md5sum
+00000000000000000000000000000000000000001|NSRLcreator.txt
+0D4A1C9ED5A49CAF22FD5F52C666DE2C|0000000000000045
+35BA15EC1C3CF03531282147DB10A089|0000000000000100
+91C66396EEC4BCEEAF6EDE7A48F60C63|0000000000000152
+A99F69068F958CF412E7F8B8A0142B41|0000000000000000
diff --git a/test/input/notablehashes.txt-md5.idx b/test/input/notablehashes.txt-md5.idx
new file mode 100644
index 0000000000..f4b63dce75
--- /dev/null
+++ b/test/input/notablehashes.txt-md5.idx
@@ -0,0 +1,6 @@
+00000000000000000000000000000000000000000|md5sum
+00000000000000000000000000000000000000001|notablehashescreator.txt
+48199F51973F317459E80E18DC744B12|0000000000000000
+5CCB10AEA1EC335139715D4AA44D0EE0|0000000000000062
+94610B03A4295300AA29C3364DB18683|0000000000000108
+A06B65C36E0E5A8229749375C3AAC4B1|0000000000000160
diff --git a/test/input/notablekeywords.xml b/test/input/notablekeywords.xml
new file mode 100644
index 0000000000..c1d856e888
--- /dev/null
+++ b/test/input/notablekeywords.xml
@@ -0,0 +1,15 @@
+
+
+
+ Jean
+ Personalized
+ DIRT
+ Osama
+ bomb
+ hacking
+ molotov
+ nuclear
+ صحافة و إعلام
+ مطلوبا
+
+
diff --git a/test/script/Emailer.py b/test/script/Emailer.py
index d7b4f7bbda..0a6a3749c4 100644
--- a/test/script/Emailer.py
+++ b/test/script/Emailer.py
@@ -25,12 +25,12 @@ def send_email(parsed, errorem, attachl, passFail):
# Create the container (outer) email message.
msg = MIMEMultipart()
if(passFail):
- msg['Subject'] = 'Autopsy Nightly test passed.'
+ msg['Subject'] = '[Test]Autopsy test passed.'
else:
- msg['Subject'] = 'Autopsy Nightly test failed.'
+ msg['Subject'] = '[Test]Autopsy test failed.'
# me == the sender's email address
# family = the list of all recipients' email addresses
- msg['From'] = 'AutopsyContinuousTest'
+ msg['From'] = 'AutopsyTest'
msg['To'] = toval
msg.preamble = 'This is a test'
container = MIMEText(errorem, 'plain')
diff --git a/test/script/srcupdater.py b/test/script/srcupdater.py
index 32bb6862d4..7fca8b5428 100644
--- a/test/script/srcupdater.py
+++ b/test/script/srcupdater.py
@@ -15,14 +15,17 @@ import xml
from xml.dom.minidom import parse, parseString
import Emailer
-def compile():
+def compile(errore, attachli, parsedin):
global redo
global tryredo
global failedbool
global errorem
+ errorem = errore
global attachl
+ attachl = attachli
global passed
global parsed
+ parsed = parsedin
passed = True
tryredo = False
redo = True
@@ -79,9 +82,11 @@ def vsBuild():
global passed
global parsed
#Please ensure that the current working directory is $autopsy/testing/script
+ oldpath = os.getcwd()
+ os.chdir(os.path.join("..", "..", "..","sleuthkit", "win32"))
vs = []
vs.append("/cygdrive/c/windows/microsoft.NET/framework/v4.0.30319/MSBuild.exe")
- vs.append(os.path.join("..", "..", "..","sleuthkit", "win32", "Tsk-win.sln"))
+ vs.append(os.path.join("Tsk-win.sln"))
vs.append("/p:configuration=release")
vs.append("/p:platform=win32")
vs.append("/t:clean")
@@ -91,6 +96,7 @@ def vsBuild():
VSout = open(VSpth, 'a')
subprocess.call(vs, stdout=VSout)
VSout.close()
+ os.chdir(oldpath)
chk = os.path.join("..", "..", "..","sleuthkit", "win32", "Release", "libtsk_jni.dll")
try:
open(chk)
@@ -152,18 +158,14 @@ def antBuild(which, Build):
def main():
- global parsed
- global errorem
- global attachl
- errorem = ""
- attachl = []
+ errore = ""
+ attachli = []
config_file = ""
arg = sys.argv.pop(0)
arg = sys.argv.pop(0)
config_file = arg
- print(config_file)
- parsed = parse(config_file)
- compile()
+ parsedin = parse(config_file)
+ compile(errore, attachli, parsedin)
class OS:
LINUX, MAC, WIN, CYGWIN = range(4)