From 895e299f174710bf1ea054ace4421e1dbd0aa3c1 Mon Sep 17 00:00:00 2001 From: Giorgio Salluzzo Date: Sat, 21 Dec 2024 19:21:30 +0100 Subject: [PATCH] Target `make safetest` got broken (#273) * Fix `Makefile`. * Only running tests that don't use real sockets got broken, fixed by adding CIENT SETINFO commands --- Makefile | 4 ++-- tests/test_mocket.py | 1 + tests/test_redis.py | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7ba0210e..3ab33d87 100644 --- a/Makefile +++ b/Makefile @@ -31,12 +31,12 @@ types: test: types @echo "Running Python tests" uv pip uninstall pook || true - export VIRTUAL_ENV=.venv; .venv/bin/wait-for-it --service httpbin.local:443 --service localhost:6379 --timeout 5 -- .venv/bin/pytest + .venv/bin/wait-for-it --service httpbin.local:443 --service localhost:6379 --timeout 5 -- .venv/bin/pytest uv pip install pook && .venv/bin/pytest tests/test_pook.py && uv pip uninstall pook @echo "" safetest: - export SKIP_TRUE_REDIS=1; export SKIP_TRUE_HTTP=1; make test + export SKIP_TRUE_REDIS=1; export SKIP_TRUE_HTTP=1; .venv/bin/pytest publish: clean install-test-requirements uv run python3 -m build --sdist --wheel . diff --git a/tests/test_mocket.py b/tests/test_mocket.py index 8d09f170..8810a5b9 100644 --- a/tests/test_mocket.py +++ b/tests/test_mocket.py @@ -222,6 +222,7 @@ def test_patch( @pytest.mark.skipif(not psutil.POSIX, reason="Uses a POSIX-only API to test") +@pytest.mark.skipif('os.getenv("SKIP_TRUE_HTTP", False)') @pytest.mark.asyncio async def test_no_dangling_fds(): url = "http://httpbin.local/ip" diff --git a/tests/test_redis.py b/tests/test_redis.py index 50b9beac..fb6ec355 100644 --- a/tests/test_redis.py +++ b/tests/test_redis.py @@ -158,9 +158,11 @@ def setUp(self): self.rclient = redis.StrictRedis() def mocketize_setup(self): + Entry.register_response("CLIENT SETINFO LIB-NAME redis-py", OK) + Entry.register_response(f"CLIENT SETINFO LIB-VER {redis.__version__}", OK) Entry.register_response("FLUSHDB", OK) self.rclient.flushdb() - self.assertEqual(len(Mocket.request_list()), 1) + self.assertEqual(len(Mocket.request_list()), 3) Mocket.reset() @mocketize