Merge pull request #869 from tlsfuzzer/fix-raw-times

Fixes for raw value parsing

tests/test_tlsfuzzer_extract.py

@@ -61,16 +61,16 @@ def setUp(self):
         log_content = "A,B\n1,0\n0,1\n1,0\n0,1\n0,1\n0,1\n0,1\n1,0\n1,0\n1,0\n"
         self.expected = (
             "A,B\n"
-            "0.000742286,0.000729452\n"
-            "0.000680365,0.000906201\n"
-            "0.000962871,0.001307492\n"
-            "0.000974224,0.000890191\n"
-            "0.000861659,0.000753251\n"
-            "0.000719014,0.000738350\n"
-            "0.000740653,0.000844232\n"
-            "0.000653504,0.000692056\n"
-            "0.000657394,0.000654963\n"
-            "0.000774939,0.000978703\n")
+            "7.422860000e-04,7.294520000e-04\n"
+            "6.803650000e-04,9.062010000e-04\n"
+            "9.628710000e-04,1.307492000e-03\n"
+            "9.742240000e-04,8.901910000e-04\n"
+            "8.616590000e-04,7.532510000e-04\n"
+            "7.190140000e-04,7.383500000e-04\n"
+            "7.406530000e-04,8.442320000e-04\n"
+            "6.535040000e-04,6.920560000e-04\n"
+            "6.573940000e-04,6.549630000e-04\n"
+            "7.749390000e-04,9.787030000e-04\n")
         self.time_vals = "\n".join(["some random header"] +
                                    list(str(i) for i in range(20)))
         # fix mock not supporting iterators
@@ -108,30 +108,30 @@ def setUp(self):
 
         self.expected_binary_conv = (
             "A,B\n"
-            "65468.000000000,12354.000000000\n"
-            "21235.000000000,45623.000000000\n"
-            "21232.000000000,88965.000000000\n"
-            "12223.000000000,32432.000000000\n"
-            "22132.000000000,21564.000000000\n"
-            "56489.000000000,54987.000000000\n"
-            "25654.000000000,54922.000000000\n"
-            "89477.000000000,56488.000000000\n"
-            "21366.000000000,52616.000000000\n"
-            "21313.000000000,56487.000000000\n"
+            "6.546800000e+04,1.235400000e+04\n"
+            "2.123500000e+04,4.562300000e+04\n"
+            "2.123200000e+04,8.896500000e+04\n"
+            "1.222300000e+04,3.243200000e+04\n"
+            "2.213200000e+04,2.156400000e+04\n"
+            "5.648900000e+04,5.498700000e+04\n"
+            "2.565400000e+04,5.492200000e+04\n"
+            "8.947700000e+04,5.648800000e+04\n"
+            "2.136600000e+04,5.261600000e+04\n"
+            "2.131300000e+04,5.648700000e+04\n"
             )
 
         self.expected_no_quickack = (
             "A,B\n"
-            "0.000758130,0.000747009\n"
-            "0.000696718,0.000920462\n"
-            "0.000980080,0.001327954\n"
-            "0.000988899,0.000904547\n"
-            "0.000875510,0.000768453\n"
-            "0.000734843,0.000752226\n"
-            "0.000754852,0.000862102\n"
-            "0.000667378,0.000706491\n"
-            "0.000671230,0.000668237\n"
-            "0.000790935,0.000992733\n"
+            "7.581300000e-04,7.470090000e-04\n"
+            "6.967180000e-04,9.204620000e-04\n"
+            "9.800800000e-04,1.327954000e-03\n"
+            "9.888990000e-04,9.045470000e-04\n"
+            "8.755100000e-04,7.684530000e-04\n"
+            "7.348430000e-04,7.522260000e-04\n"
+            "7.548520000e-04,8.621020000e-04\n"
+            "6.673780000e-04,7.064910000e-04\n"
+            "6.712300000e-04,6.682370000e-04\n"
+            "7.909350000e-04,9.927330000e-04\n"
             )
 
     def file_selector(self, *args, **kwargs):
@@ -1482,4 +1482,4 @@ def test_multiple_measurement_creation(
         self.assertGreater(
             self.times_used_write, 0,
             "At least one measurement should have been written."
-        )
+        )

tlsfuzzer/extract.py

@@ -353,6 +353,7 @@ def _convert_binary_file(self, raw_times_name):
         times_iter = self._get_time_from_file()
 
         with open(raw_times_name, 'w') as raw_times:
+            raw_times.write("raw times\n")
             for val in times_iter:
                 raw_times.write(str(val) + '\n')
 
@@ -621,7 +622,7 @@ def _write_csv(self):
             writer = csv.writer(csvfile, quoting=csv.QUOTE_MINIMAL)
             for values in zip(*[self.timings[i] for i in
                     self._write_class_names]):
-                writer.writerow("{0:.9f}".format(i) for i in values)
+                writer.writerow("{0:.9e}".format(float(i)) for i in values)
 
             for i in self.timings.values():
                 i.clear()