Improvements for benchmark results in CSV

sdc/tests/tests_perf/test_perf_utils.py

@@ -200,7 +200,7 @@ class ResultsDriver:
 
     def __init__(self, file_name, raw_file_name=None):
         self.file_name = file_name
-        self.raw_file_name = raw_file_name if raw_file_name else f'raw_{file_name}'
+        self.raw_file_name = raw_file_name or f'raw_{file_name}'
 
 
 class ExcelResultsDriver(ResultsDriver):
@@ -226,15 +226,16 @@ def dump_test_results_data(self, test_results_data, logger=None):
 
     def load(self, logger=None):
         raw_perf_results_xlsx = Path(self.raw_file_name)
-        if raw_perf_results_xlsx.exists():
-            with raw_perf_results_xlsx.open('rb') as fd:
-                # xlrd need to be installed
-                try:
-                    return pandas.read_excel(fd)
-                except ModuleNotFoundError as e:
-                    if logger:
-                        msg = 'Could not load previous results from %s: %s'
-                        logger.warning(msg, self.raw_file_name, e)
+        if not raw_perf_results_xlsx.exists():
+            return
+        with raw_perf_results_xlsx.open('rb') as fd:
+            # xlrd need to be installed
+            try:
+                return pandas.read_excel(fd)
+            except ModuleNotFoundError as e:
+                if logger:
+                    msg = 'Could not load previous results from %s: %s'
+                    logger.warning(msg, self.raw_file_name, e)
 
 
 class CSVResultsDriver(ResultsDriver):
@@ -247,15 +248,15 @@ def dump_test_results_data(self, test_results_data, logger=None):
 
     def load(self, logger=None):
         raw_perf_results_csv = Path(self.raw_file_name)
-        if raw_perf_results_csv.exists():
-            with raw_perf_results_csv.open('rb') as fd:
-                # xlrd need to be installed
-                try:
-                    return pandas.read_csv(fd)
-                except ModuleNotFoundError as e:
-                    if logger:
-                        msg = 'Could not load previous results from %s: %s'
-                        logger.warning(msg, self.raw_file_name, e)
+        if not raw_perf_results_csv.exists():
+            return
+        with raw_perf_results_csv.open('rb') as fd:
+            try:
+                return pandas.read_csv(fd)
+            except ModuleNotFoundError as e:
+                if logger:
+                    msg = 'Could not load previous results from %s: %s'
+                    logger.warning(msg, self.raw_file_name, e)
 
 
 class TestResults:
@@ -265,7 +266,6 @@ class TestResults:
 
     def __init__(self, drivers=None):
         self.drivers = drivers or []
-        self.default_driver = drivers[0] if drivers else None
 
     @property
     def grouped_data(self):
@@ -345,10 +345,11 @@ def load(self):
         """
         Load existing performance testing results from excel to global data storage
         """
-        if self.default_driver:
-            test_results_data = self.default_driver.load(self.logger)
-            if test_results_data is not None:
+        for d in self.drivers:
+            test_results_data = d.load(self.logger)
+            if test_results_data:
                 self.test_results_data = test_results_data
+                break
 
 
 class TestResultsStr(TestResults):