From 9b47ac7cf1a02f258d4662ae1978fd22394050fd Mon Sep 17 00:00:00 2001 From: Johnny Brenes Date: Mon, 2 Oct 2023 12:41:40 -0600 Subject: [PATCH 1/3] Improve error handling when metadata disabled --- .../edfi_paging_test/helpers/api_metadata.py | 4 ++-- src/edfi-paging-test/edfi_paging_test/performance_tester.py | 2 +- src/edfi-paging-test/edfi_paging_test/reporter/reporter.py | 2 +- src/edfi-paging-test/edfi_paging_test/reporter/summary.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py b/src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py index 4548cfc2..25e02d19 100644 --- a/src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py +++ b/src/edfi-paging-test/edfi_paging_test/helpers/api_metadata.py @@ -36,8 +36,8 @@ def get_base_api_response(api_base_url: str, verify_cert: bool = True) -> Dict[s api_base_url, verify=verify_cert ).json() - except Exception as e: - raise RuntimeError(f"Error fetching: {api_base_url}") from e + except requests.exceptions.RequestException as e: + raise RuntimeError(f"Error: {e}.") from e @cache diff --git a/src/edfi-paging-test/edfi_paging_test/performance_tester.py b/src/edfi-paging-test/edfi_paging_test/performance_tester.py index e894bb2d..6212d786 100644 --- a/src/edfi-paging-test/edfi_paging_test/performance_tester.py +++ b/src/edfi-paging-test/edfi_paging_test/performance_tester.py @@ -59,7 +59,7 @@ def fetch_resource(request_client: RequestClient, target_resource: str) -> None: def invalid_resources( openapi_resources: List[str], resources_to_check: List[str] ) -> List[str]: - return [r for r in resources_to_check if r.lower() not in openapi_resources] + return [r for r in resources_to_check if r not in openapi_resources] async def run(args: MainArguments) -> None: diff --git a/src/edfi-paging-test/edfi_paging_test/reporter/reporter.py b/src/edfi-paging-test/edfi_paging_test/reporter/reporter.py index c86c3e4f..1987deb6 100644 --- a/src/edfi-paging-test/edfi_paging_test/reporter/reporter.py +++ b/src/edfi-paging-test/edfi_paging_test/reporter/reporter.py @@ -44,7 +44,7 @@ def _calculate_statistics(df: DataFrame) -> DataFrame: "MeanTime": s["MeanTime"].mean(), # "Unbiased" estimate of standard deviation for a sample # (ddof=1, panda's default). Equivalent of Excel STDEV.S() - "StDeviation": s["StDeviation"].std().round(6), + "StDeviation": s["StDeviation"].std().round(6), # type: ignore "NumberOfErrors": s[(s["StatusCode"] >= 400)]["StatusCode"].count(), } ) diff --git a/src/edfi-paging-test/edfi_paging_test/reporter/summary.py b/src/edfi-paging-test/edfi_paging_test/reporter/summary.py index 5b55bcfd..b00446fd 100644 --- a/src/edfi-paging-test/edfi_paging_test/reporter/summary.py +++ b/src/edfi-paging-test/edfi_paging_test/reporter/summary.py @@ -18,10 +18,10 @@ class Summary: machine_name : str = socket.gethostname() def __post_init__(self): - if(self.run_configration): + if (self.run_configration): self.run_configration.resourceList = (self.run_configration.resourceList or ["all"]) - self.run_configration.contentType = self.run_configration.contentType.value - self.run_configration.log_level = self.run_configration.log_level.value + self.run_configration.contentType = self.run_configration.contentType + self.run_configration.log_level = self.run_configration.log_level def get_DataFrame(self) -> DataFrame: """ From edccfd22236407780640125568436d42f79f25e2 Mon Sep 17 00:00:00 2001 From: Johnny Brenes Date: Mon, 2 Oct 2023 13:03:31 -0600 Subject: [PATCH 2/3] build problem --- src/edfi-paging-test/tests/reporter/test_reporter.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/edfi-paging-test/tests/reporter/test_reporter.py b/src/edfi-paging-test/tests/reporter/test_reporter.py index 5e69325f..6f33c498 100644 --- a/src/edfi-paging-test/tests/reporter/test_reporter.py +++ b/src/edfi-paging-test/tests/reporter/test_reporter.py @@ -1,5 +1,5 @@ import pytest -import re +# import re from pandas import DataFrame, read_csv, read_json from os import path from edfi_paging_test.reporter.summary import Summary @@ -474,4 +474,5 @@ def the_file_has_expected_data(fs: FakeFilesystem) -> None: with open(EXPECTED_FILE) as f: actual = f.read() - assert actual == re.sub('\\s+', '', CONTENTS) + # assert actual == re.sub('\\s+', '', CONTENTS) + assert actual == CONTENTS From c44bc365a9327d8fa52c15c774ab103098a87539 Mon Sep 17 00:00:00 2001 From: Johnny Brenes Date: Mon, 2 Oct 2023 14:28:59 -0600 Subject: [PATCH 3/3] build errors --- src/edfi-paging-test/edfi_paging_test/reporter/summary.py | 4 ++-- src/edfi-paging-test/tests/reporter/test_reporter.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/edfi-paging-test/edfi_paging_test/reporter/summary.py b/src/edfi-paging-test/edfi_paging_test/reporter/summary.py index b00446fd..4461d21c 100644 --- a/src/edfi-paging-test/edfi_paging_test/reporter/summary.py +++ b/src/edfi-paging-test/edfi_paging_test/reporter/summary.py @@ -20,8 +20,8 @@ class Summary: def __post_init__(self): if (self.run_configration): self.run_configration.resourceList = (self.run_configration.resourceList or ["all"]) - self.run_configration.contentType = self.run_configration.contentType - self.run_configration.log_level = self.run_configration.log_level + self.run_configration.contentType = self.run_configration.contentType.value # type: ignore + self.run_configration.log_level = self.run_configration.log_level.value # type: ignore def get_DataFrame(self) -> DataFrame: """ diff --git a/src/edfi-paging-test/tests/reporter/test_reporter.py b/src/edfi-paging-test/tests/reporter/test_reporter.py index 6f33c498..5e69325f 100644 --- a/src/edfi-paging-test/tests/reporter/test_reporter.py +++ b/src/edfi-paging-test/tests/reporter/test_reporter.py @@ -1,5 +1,5 @@ import pytest -# import re +import re from pandas import DataFrame, read_csv, read_json from os import path from edfi_paging_test.reporter.summary import Summary @@ -474,5 +474,4 @@ def the_file_has_expected_data(fs: FakeFilesystem) -> None: with open(EXPECTED_FILE) as f: actual = f.read() - # assert actual == re.sub('\\s+', '', CONTENTS) - assert actual == CONTENTS + assert actual == re.sub('\\s+', '', CONTENTS)