From d3b34a5b6ab90dfbfe584c34e58efac74d85b9cc Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 26 Feb 2024 14:07:26 +0100 Subject: [PATCH 1/5] refactor using `tmpdir` in tests --- tests/test_defaults.py | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/tests/test_defaults.py b/tests/test_defaults.py index 96a14f8b..987507ec 100644 --- a/tests/test_defaults.py +++ b/tests/test_defaults.py @@ -81,8 +81,8 @@ def global_test_2(): assert global_test_2.cache_dpath() is not None -def test_cache_dir_default_param(): - cachier.set_default_params(cache_dir="/path_1") +def test_cache_dir_default_param(tmpdit): + cachier.set_default_params(cache_dir=tmpdit) @cachier.cachier() def global_test_1(): @@ -92,32 +92,28 @@ def global_test_1(): def global_test_2(): return None - assert global_test_1.cache_dpath() == "/path_1" - assert global_test_2.cache_dpath() == "/path_2" + assert global_test_1.cache_dpath() == tmpdit + assert global_test_2.cache_dpath() == tmpdit -def test_separate_files_default_param(): +def test_separate_files_default_param(tmpdir): cachier.set_default_params(separate_files=True) - @cachier.cachier(cache_dir=tempfile.mkdtemp()) + @cachier.cachier(cache_dir=tmpdir / "1") def global_test_1(arg_1, arg_2): return arg_1 + arg_2 - @cachier.cachier(cache_dir=tempfile.mkdtemp(), separate_files=False) + @cachier.cachier(cache_dir=tmpdir / "2", separate_files=False) def global_test_2(arg_1, arg_2): return arg_1 + arg_2 - global_test_1.clear_cache() global_test_1(1, 2) global_test_1(3, 4) - global_test_2.clear_cache() global_test_2(1, 2) global_test_2(3, 4) - cache_dir_1 = global_test_1.cache_dpath() - cache_dir_2 = global_test_2.cache_dpath() - assert len(os.listdir(cache_dir_1)) == 2 - assert len(os.listdir(cache_dir_2)) == 1 + assert len(os.listdir(global_test_1.cache_dpath())) == 2 + assert len(os.listdir(global_test_2.cache_dpath())) == 1 def test_allow_none_default_param(): @@ -128,13 +124,13 @@ def test_allow_none_default_param(): ) allow_count = disallow_count = 0 - @cachier.cachier(cache_dir=tempfile.mkdtemp()) + @cachier.cachier(cache_dir=tmpdir) def allow_none(): nonlocal allow_count allow_count += 1 return None - @cachier.cachier(cache_dir=tempfile.mkdtemp(), allow_none=False) + @cachier.cachier(cache_dir=tmpdir, allow_none=False) def disallow_none(): nonlocal disallow_count disallow_count += 1 @@ -155,14 +151,13 @@ def disallow_none(): assert disallow_count == 2 -parametrize_keys = "backend,mongetter" -parametrize_values = [ +PARAMETRIZE_TEST = ("backend,mongetter", [ pytest.param("pickle", None, marks=pytest.mark.pickle), - pytest.param("mongo", _test_mongetter, marks=pytest.mark.mongo), -] + pytest.param("mongo", _test_mongetter, marks=pytest.mark.mongo),] + ) -@pytest.mark.parametrize(parametrize_keys, parametrize_values) +@pytest.mark.parametrize(*PARAMETRIZE_TEST) def test_stale_after_applies_dynamically(backend, mongetter): @cachier.cachier(backend=backend, mongetter=mongetter) def _stale_after_test(arg_1, arg_2): @@ -180,7 +175,7 @@ def _stale_after_test(arg_1, arg_2): assert val3 != val1 -@pytest.mark.parametrize(parametrize_keys, parametrize_values) +@pytest.mark.parametrize(*PARAMETRIZE_TEST) def test_next_time_applies_dynamically(backend, mongetter): NEXT_AFTER_DELTA = datetime.timedelta(seconds=3) @@ -206,8 +201,9 @@ def _stale_after_next_time(arg_1, arg_2): _stale_after_next_time.clear_cache() -@pytest.mark.parametrize(parametrize_keys, parametrize_values) +@pytest.mark.parametrize(*PARAMETRIZE_TEST) def test_wait_for_calc_applies_dynamically(backend, mongetter): + """Testing for calls timing out to be performed twice when needed.""" @cachier.cachier(backend=backend, mongetter=mongetter) def _wait_for_calc_timeout_slow(arg_1, arg_2): time.sleep(3) @@ -218,7 +214,6 @@ def _calls_wait_for_calc_timeout_slow(res_queue): res_queue.put(res) cachier.set_default_params(wait_for_calc_timeout=2) - """Testing for calls timing out to be performed twice when needed.""" _wait_for_calc_timeout_slow.clear_cache() res_queue = queue.Queue() thread1 = threading.Thread( From 635b8302ebc3e355df00a3bc348cbb49cb7b5f40 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 13:07:54 +0000 Subject: [PATCH 2/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- tests/test_defaults.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/test_defaults.py b/tests/test_defaults.py index 987507ec..c6432453 100644 --- a/tests/test_defaults.py +++ b/tests/test_defaults.py @@ -151,10 +151,13 @@ def disallow_none(): assert disallow_count == 2 -PARAMETRIZE_TEST = ("backend,mongetter", [ - pytest.param("pickle", None, marks=pytest.mark.pickle), - pytest.param("mongo", _test_mongetter, marks=pytest.mark.mongo),] - ) +PARAMETRIZE_TEST = ( + "backend,mongetter", + [ + pytest.param("pickle", None, marks=pytest.mark.pickle), + pytest.param("mongo", _test_mongetter, marks=pytest.mark.mongo), + ], +) @pytest.mark.parametrize(*PARAMETRIZE_TEST) @@ -204,6 +207,7 @@ def _stale_after_next_time(arg_1, arg_2): @pytest.mark.parametrize(*PARAMETRIZE_TEST) def test_wait_for_calc_applies_dynamically(backend, mongetter): """Testing for calls timing out to be performed twice when needed.""" + @cachier.cachier(backend=backend, mongetter=mongetter) def _wait_for_calc_timeout_slow(arg_1, arg_2): time.sleep(3) From 24b1bdb3e93fd4d465f36137d5cd2859e629777f Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 26 Feb 2024 14:10:03 +0100 Subject: [PATCH 3/5] fixing --- tests/test_defaults.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/test_defaults.py b/tests/test_defaults.py index c6432453..94498238 100644 --- a/tests/test_defaults.py +++ b/tests/test_defaults.py @@ -2,7 +2,6 @@ import os import queue import random -import tempfile import threading import time @@ -116,7 +115,7 @@ def global_test_2(arg_1, arg_2): assert len(os.listdir(global_test_2.cache_dpath())) == 1 -def test_allow_none_default_param(): +def test_allow_none_default_param(tmpdir): cachier.set_default_params( allow_none=True, separate_files=True, From 9dc15f5ec9887daee7d6a04610618d5f77fb7d9c Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 26 Feb 2024 14:30:55 +0100 Subject: [PATCH 4/5] fixing --- tests/test_defaults.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_defaults.py b/tests/test_defaults.py index 94498238..cc6af574 100644 --- a/tests/test_defaults.py +++ b/tests/test_defaults.py @@ -81,18 +81,18 @@ def global_test_2(): def test_cache_dir_default_param(tmpdit): - cachier.set_default_params(cache_dir=tmpdit) + cachier.set_default_params(cache_dir=tmpdit / "1") @cachier.cachier() def global_test_1(): return None - @cachier.cachier(cache_dir="/path_2") + @cachier.cachier(cache_dir=tmpdit / "2") def global_test_2(): return None - assert global_test_1.cache_dpath() == tmpdit - assert global_test_2.cache_dpath() == tmpdit + assert global_test_1.cache_dpath() == tmpdit / "1" + assert global_test_2.cache_dpath() == tmpdit / "2" def test_separate_files_default_param(tmpdir): From 4fe833771775990a934947191ced71920615ba2e Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 26 Feb 2024 17:55:02 +0100 Subject: [PATCH 5/5] typo --- tests/test_defaults.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_defaults.py b/tests/test_defaults.py index cc6af574..dc87a4ae 100644 --- a/tests/test_defaults.py +++ b/tests/test_defaults.py @@ -80,19 +80,19 @@ def global_test_2(): assert global_test_2.cache_dpath() is not None -def test_cache_dir_default_param(tmpdit): - cachier.set_default_params(cache_dir=tmpdit / "1") +def test_cache_dir_default_param(tmpdir): + cachier.set_default_params(cache_dir=tmpdir / "1") @cachier.cachier() def global_test_1(): return None - @cachier.cachier(cache_dir=tmpdit / "2") + @cachier.cachier(cache_dir=tmpdir / "2") def global_test_2(): return None - assert global_test_1.cache_dpath() == tmpdit / "1" - assert global_test_2.cache_dpath() == tmpdit / "2" + assert global_test_1.cache_dpath() == str(tmpdir / "1") + assert global_test_2.cache_dpath() == str(tmpdir / "2") def test_separate_files_default_param(tmpdir):