Added some error catching

This commit is contained in:
Sean-M 2013-02-21 12:20:18 -05:00
parent 70a2d1f6e1
commit 7d52a0c15a

View File

@ -280,7 +280,7 @@ class Database:
global failedbool global failedbool
global errorem global errorem
failedbool = True failedbool = True
errorem += "There was a difference in the number of artifacts.\n" errorem += "There was a difference in the number of artifacts for " + case.image + ".\n"
return "; ".join(self.artifact_comparison) return "; ".join(self.artifact_comparison)
def get_attribute_comparison(self): def get_attribute_comparison(self):
@ -289,7 +289,7 @@ class Database:
global failedbool global failedbool
global errorem global errorem
failedbool = True failedbool = True
errorem += "There was a difference in the number of attributes.\n" errorem += "There was a difference in the number of attributes for " + case.image + ".\n"
list = [] list = []
for error in self.attribute_comparison: for error in self.attribute_comparison:
list.append(error) list.append(error)
@ -720,7 +720,7 @@ def compare_bb_artifacts():
global failedbool global failedbool
global errorem global errorem
failedbool = True failedbool = True
errorem += "There was a difference in the number of artifacts.\n" errorem += "There was a difference in the number of artifacts for " + case.image + ".\n"
return exceptions return exceptions
except Exception as e: except Exception as e:
exceptions.append("Error: Unable to compare blackboard_artifacts.\n") exceptions.append("Error: Unable to compare blackboard_artifacts.\n")
@ -738,7 +738,7 @@ def compare_bb_attributes():
global failedbool global failedbool
global errorem global errorem
failedbool = True failedbool = True
errorem += "There was a difference in the number of attributes.\n" errorem += "There was a difference in the number of attributes for " + case.image + ".\n"
return exceptions return exceptions
except Exception as e: except Exception as e:
exceptions.append("Error: Unable to compare blackboard_attributes.\n") exceptions.append("Error: Unable to compare blackboard_attributes.\n")
@ -756,7 +756,7 @@ def compare_tsk_objects():
global failedbool global failedbool
global errorem global errorem
failedbool = True failedbool = True
errorem += "There was a difference between the tsk object counts.\n" errorem += "There was a difference between the tsk object counts for " + case.image + " .\n"
return exceptions return exceptions
except Exception as e: except Exception as e:
exceptions.append("Error: Unable to compare tsk_objects.\n") exceptions.append("Error: Unable to compare tsk_objects.\n")
@ -1598,6 +1598,12 @@ def execute_test():
run_test(make_path(case.input_dir, file), 0) run_test(make_path(case.input_dir, file), 0)
write_html_foot() write_html_foot()
html.close() html.close()
logres = search_common_log("ERROR")
if (logres>0):
failedbool = True
global errorem
for lm in logres:
errorem += lm
if failedbool: if failedbool:
htmll = html.name.split('\\') htmll = html.name.split('\\')
ainsert = html.name ainsert = html.name