Merge branch 'master' of https://github.com/sleuthkit/autopsy

Testing/test/qa-functional/src/org/sleuthkit/autopsy/testing/RegressionTest.java

@@ -60,31 +60,34 @@ import org.netbeans.junit.NbModuleSuite;
 import org.openide.util.Exceptions;
 import org.sleuthkit.autopsy.ingest.IngestManager;
 import org.sleuthkit.autopsy.keywordsearch.*;
+
 /**
- * This test expects the following system properties to be set:
+ * This test expects the following system properties to be set: img_path: The
- * img_path: The fully qualified path to the image file (if split, the first file)
+ * fully qualified path to the image file (if split, the first file) out_path:
- * out_path: The location where the case will be stored
+ * The location where the case will be stored nsrl_path: Path to the nsrl
- * nsrl_path: Path to the nsrl database
+ * database known_bad_path: Path to a database of known bad hashes keyword_path:
- * known_bad_path: Path to a database of known bad hashes
+ * Path to a keyword list xml file ignore_unalloc: Boolean whether to ignore
- * keyword_path: Path to a keyword list xml file
+ * unallocated space or not
- * ignore_unalloc: Boolean whether to ignore unallocated space or not
  *
- * Without these properties set, the test will fail to run correctly.
+ * Without these properties set, the test will fail to run correctly. To run
- * To run this test correctly, you should use the script 'regression.py'
+ * this test correctly, you should use the script 'regression.py' located in the
- * located in the 'script' directory of the Testing module.
+ * 'script' directory of the Testing module.
  */
 public class RegressionTest extends TestCase {
 
     private static final Logger logger = Logger.getLogger(RegressionTest.class.getName());
     long start;
 
-    /** Constructor required by JUnit */
+    /**
+     * Constructor required by JUnit
+     */
     public RegressionTest(String name) {
         super(name);
     }
 
-    
+    /**
-    /** Creates suite from particular test cases. */
+     * Creates suite from particular test cases.
+     */
     public static Test suite() {
         // run tests with specific configuration
         NbModuleSuite.Configuration conf = NbModuleSuite.createConfiguration(RegressionTest.class).
@@ -100,21 +103,24 @@ public class RegressionTest extends TestCase{
                 "testAddSourceWizard1",
                 "testIngest",
                 "testGenerateReportToolbar",
-                "testGenerateReportButton"
+                "testGenerateReportButton");
-                );
         return NbModuleSuite.create(conf);
 
 
     }
 
-    /** Method called before each test case. */
+    /**
+     * Method called before each test case.
+     */
     @Override
     public void setUp() {
 
         logger.info("########  " + System.getProperty("img_path") + "  #######");
     }
 
-    /** Method called after each test case. */
+    /**
+     * Method called after each test case.
+     */
     @Override
     public void tearDown() {
     }
@@ -146,7 +152,11 @@ public class RegressionTest extends TestCase{
         logger.info("Starting Add Image process");
         WizardOperator wo = new WizardOperator("Add Data");
         JTextFieldOperator jtfo0 = new JTextFieldOperator(wo, 0);
-        String imageDir = System.getProperty("img_path");
+        String img_path = System.getProperty("img_path");
+        if (img_path.startsWith("\\")) {
+            img_path = "\\" + img_path;
+        }
+        String imageDir = img_path;
         ((JTextField) jtfo0.getSource()).setText(imageDir);
         wo.btNext().clickMouse();
     }
@@ -324,8 +334,8 @@ public class RegressionTest extends TestCase{
 
         }
     }
-   private void setListForIngest()
+
-   {
+    private void setListForIngest() {
         KeywordSearchListsXML curr = KeywordSearchListsXML.getCurrent();
         curr.setUseForIngest("URLs", true);
     }

test/script/Emailer.py

@@ -38,7 +38,11 @@ def send_email(parsed, errorem, attachl, passFail):
 	msg.attach(container)
 	Build_email(msg, attachl)
 	s = smtplib.SMTP(serverval)
+	try:
+		print('Sending Email')
 		s.sendmail(msg['From'], msg['To'], msg.as_string())
+	except Exception as e:
+		print(str(e))
 	s.quit()
 	
 def Build_email(msg, attachl):

test/script/regression.py

@@ -361,9 +361,12 @@ class Database:
 				except Exception as e:
 					printerror(test_img, str(e))
 					printerror(test_img, str(rw[3]))
-					errorem += "Artifact with id#" + str(rw[3]) + " encountered an error.\n"
+					print(test_img.image_name)
+					errorem += test_img.image_name + ":Artifact with id#" + str(rw[3]) + " encountered an error.\n"
 					looptry = False
+					print(test_img.artifact_fail)
 					test_img.artifact_fail += 1
+					print(test_img.artifact_fail)
 				if(looptry == True):
 					src = attributes[0][0]
 					for attr in attributes:
@@ -404,10 +407,11 @@ class Database:
 				rw = autopsy_cur2.fetchone()
 			srtcmdlst = ["sort", test_img.autopsy_data_file, "-o", test_img.sorted_data_file]
 			subprocess.call(srtcmdlst)
-		except Exception as e:
+			print(test_img.artifact_fail)
-			printerror(test_img, 'outer exception: ' + str(e))
 			if(test_img.artifact_fail > 0):
 				errorem += test_img.image_name + ":There were " + str(test_img.artifact_count) + " artifacts and " + str(test_img.artifact_fail) + " threw an exception while loading.\n"
+		except Exception as e:
+			printerror(test_img, 'outer exception: ' + str(e))
 			
 	def _dbDump(test_img):
 		autopsy_db_file = Emailer.make_path(test_case.output_dir, test_img.image_name,