From 52b42371dd953e1d191116fe7432e0b110492e37 Mon Sep 17 00:00:00 2001 From: Shane Snyder Date: Thu, 8 Feb 2024 14:24:33 -0600 Subject: [PATCH 1/3] remove skipif decorators --- darshan-util/pydarshan/darshan/tests/test_report.py | 2 -- darshan-util/pydarshan/darshan/tests/test_summary.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/darshan-util/pydarshan/darshan/tests/test_report.py b/darshan-util/pydarshan/darshan/tests/test_report.py index c9c3d99ed..92ec78fed 100644 --- a/darshan-util/pydarshan/darshan/tests/test_report.py +++ b/darshan-util/pydarshan/darshan/tests/test_report.py @@ -29,8 +29,6 @@ def response(): pass -@pytest.mark.skipif(not pytest.has_log_repo, - reason="missing darshan_logs") @pytest.mark.parametrize("log_filepath", _provide_logs_repo_filepaths() ) diff --git a/darshan-util/pydarshan/darshan/tests/test_summary.py b/darshan-util/pydarshan/darshan/tests/test_summary.py index c4e7ee113..b6d8254c8 100644 --- a/darshan-util/pydarshan/darshan/tests/test_summary.py +++ b/darshan-util/pydarshan/darshan/tests/test_summary.py @@ -177,8 +177,6 @@ def test_main_without_args(tmpdir, argv, expected_img_count, expected_table_coun summary.main() -@pytest.mark.skipif(not pytest.has_log_repo, - reason="missing darshan_logs") @pytest.mark.parametrize("log_filepath", _provide_logs_repo_filepaths() ) From 49d81e72f9d3e314a0903479ab559742e89db1bc Mon Sep 17 00:00:00 2001 From: Shane Snyder Date: Fri, 9 Feb 2024 10:09:20 -0600 Subject: [PATCH 2/3] Revert "remove skipif decorators" This reverts commit 52b42371dd953e1d191116fe7432e0b110492e37. --- darshan-util/pydarshan/darshan/tests/test_report.py | 2 ++ darshan-util/pydarshan/darshan/tests/test_summary.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/darshan-util/pydarshan/darshan/tests/test_report.py b/darshan-util/pydarshan/darshan/tests/test_report.py index 92ec78fed..c9c3d99ed 100644 --- a/darshan-util/pydarshan/darshan/tests/test_report.py +++ b/darshan-util/pydarshan/darshan/tests/test_report.py @@ -29,6 +29,8 @@ def response(): pass +@pytest.mark.skipif(not pytest.has_log_repo, + reason="missing darshan_logs") @pytest.mark.parametrize("log_filepath", _provide_logs_repo_filepaths() ) diff --git a/darshan-util/pydarshan/darshan/tests/test_summary.py b/darshan-util/pydarshan/darshan/tests/test_summary.py index b6d8254c8..c4e7ee113 100644 --- a/darshan-util/pydarshan/darshan/tests/test_summary.py +++ b/darshan-util/pydarshan/darshan/tests/test_summary.py @@ -177,6 +177,8 @@ def test_main_without_args(tmpdir, argv, expected_img_count, expected_table_coun summary.main() +@pytest.mark.skipif(not pytest.has_log_repo, + reason="missing darshan_logs") @pytest.mark.parametrize("log_filepath", _provide_logs_repo_filepaths() ) From b35d3a82f4f761e93995a9cfe051037a7f7b0c41 Mon Sep 17 00:00:00 2001 From: Shane Snyder Date: Fri, 9 Feb 2024 10:21:05 -0600 Subject: [PATCH 3/3] apply Tyler's suggestion for supressing mypy error --- darshan-util/pydarshan/mypy.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/darshan-util/pydarshan/mypy.ini b/darshan-util/pydarshan/mypy.ini index 60f7df846..a93064959 100644 --- a/darshan-util/pydarshan/mypy.ini +++ b/darshan-util/pydarshan/mypy.ini @@ -45,3 +45,6 @@ ignore_missing_imports = True [mypy-darshan.backend.cffi_backend] ignore_errors = True + +[mypy-darshan.tests.*] +disable_error_code = attr-defined