From f213d8dab4bd780a6f2b2f5eb44257b6082ccc6b Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Fri, 6 Dec 2019 17:22:35 +0300 Subject: [PATCH 1/3] Small improvement in ResultsDriver.__init__() --- sdc/tests/tests_perf/test_perf_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdc/tests/tests_perf/test_perf_utils.py b/sdc/tests/tests_perf/test_perf_utils.py index 3f43c9819..ca4a83153 100644 --- a/sdc/tests/tests_perf/test_perf_utils.py +++ b/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): From be41dfa379280fc5184dba231f7562c9e3b3b4bd Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Fri, 6 Dec 2019 17:25:03 +0300 Subject: [PATCH 2/3] Small improvements in ResultDrivers --- sdc/tests/tests_perf/test_perf_utils.py | 37 +++++++++++++------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/sdc/tests/tests_perf/test_perf_utils.py b/sdc/tests/tests_perf/test_perf_utils.py index ca4a83153..dcb944a8e 100644 --- a/sdc/tests/tests_perf/test_perf_utils.py +++ b/sdc/tests/tests_perf/test_perf_utils.py @@ -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: From 4e7f4d71a6075194e3694dacd877f331ede0f330 Mon Sep 17 00:00:00 2001 From: Sergey Pokhodenko Date: Fri, 6 Dec 2019 17:57:05 +0300 Subject: [PATCH 3/3] Improve TestResult loading. Try all drivers for load prev results. --- sdc/tests/tests_perf/test_perf_utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdc/tests/tests_perf/test_perf_utils.py b/sdc/tests/tests_perf/test_perf_utils.py index dcb944a8e..4e3d5514f 100644 --- a/sdc/tests/tests_perf/test_perf_utils.py +++ b/sdc/tests/tests_perf/test_perf_utils.py @@ -266,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): @@ -346,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):