Make MMComm tests more verbose

code/Test/test_determinism_mmcomm.py

@@ -60,14 +60,19 @@ class PcapComparison(unittest.TestCase):
         self.executions = []
 
     def test_determinism(self):
+        self.print_warning("\n")  # print initial new line
+        self.print_warning("Conducting test for determinism of Membership Management Communication Attack:\n")
         input_pcap = os.environ.get(self.PCAP_ENVIRONMENT_VALUE, self.DEFAULT_PCAP)
         seed = os.environ.get(self.SEED_ENVIRONMENT_VALUE, self.DEFAULT_SEED)
 
         if self.id2t_params is None:
             self.id2t_params = self.random_id2t_params()
 
-        for params in self.id2t_params:
+        for i, params in enumerate(self.id2t_params):
+            self.print_warning("Test round %d:" % (i+1))
+            self.print_warning("=================================")
             self.do_test_round(input_pcap, seed, params)
+            self.print_warning()
 
     def do_test_round(self, input_pcap, seed, additional_params):
         generated_pcap = None
@@ -114,7 +119,8 @@ class PcapComparison(unittest.TestCase):
         self.print_warning("Done")
 
         kept = [file for file in id2t_run.get_kept_files() for id2t_run in self.executions]
-        self.print_warning("The following files have been kept: " + ", ".join(kept))
+        if kept:
+            self.print_warning("The following files have been kept: " + ", ".join(kept))
 
     def compare_pcaps(self, one: str, other: str):
         PcapComparator().compare_files(self.ID2T_PATH + "/" + one, self.ID2T_PATH + "/" + other)

code/Test/test_regression_mmcomm.py

@@ -14,6 +14,7 @@ class RegressionTest(unittest.TestCase):
     META_FILE = "fileinfo.xml"
 
     def test_regression(self):
+        self.print_warning("\n")  # print initial new line
         config_location = self.REGRESSION_DIRECTORY + os.sep + self.META_FILE
         xml_root = xml.etree.ElementTree.parse(config_location).getroot()
         comparator = PcapComparator()
@@ -36,6 +37,7 @@ class RegressionTest(unittest.TestCase):
             outfile = os.path.join(self.REGRESSION_DIRECTORY, test.get("outfile"))
 
             execution = ID2TExecution(infile, seed=test.get("seed"))
+            self.print_warning("Running %s with command:" % test.get("name"))
             self.print_warning(execution.get_run_command(params))
             execution.run(params)
 
@@ -46,9 +48,9 @@ class RegressionTest(unittest.TestCase):
                 comparator.compare_files(new_file, old_file)
             except AssertionError as e:
                 execution.cleanup()
-                raise AssertionError("Test %s failed" % test.get("name")) from e
+                raise AssertionError("Test failed") from e
 
-            self.print_warning("Regression-test %s passed" % test.get("name"))
+            self.print_warning("Test passed")
 
     def assertXMLTagHasAttribute(self, tag, attribute, msg=None):
         self.assertIsNotNone(tag.get(attribute), msg)