Fix retries & write_csv

Author: atuchin-m

components/result_map.py

@@ -61,3 +61,5 @@ def write_csv(self, output_file: str, append: bool):
         rstdev = stdev / avg if avg > 0 else 0
         result_writer.writerow([metric_str, browser, version] +
                                 [avg, stdev, rstdev] + [''] + values)
+    self._map = {}
+    self._error = {}

measure.py

@@ -66,22 +66,22 @@ def main():
     browser_name = browser_class().name()
     browser_version = browser_class().get_version()
     logging.info('Testing %s %s', browser_name, browser_version)
-    attempt = 0
-
-    for iteration in range(repeat):
+    failed_iteration_count = 0
+    good_iteration_count = 0
+    while good_iteration_count < repeat:
       try:
-        metrics = measure.Run(iteration, browser_class)
+        metrics = measure.Run(good_iteration_count, browser_class)
         logging.debug([test_name, browser_name, browser_version, metrics])
         for metric, key, value in metrics:
           results.addValue(browser_name, browser_version, metric, key, value)
+        good_iteration_count += 1
       except Exception as e:
-        attempt += 1
-        if attempt <= args.retry_count:
+        failed_iteration_count += 1
+        if failed_iteration_count <= args.retry_count:
           logging.error('Got error %s, retrying', e)
-          iteration -= 1
         else:
           final_messages.append(
-            f'{test_name}/{browser_name}/{iteration} failed')
+            f'{test_name}/{browser_name}/{good_iteration_count} failed')
           raise
 
     results.write_csv(args.output, args.append)