Skip to content

Commit

Permalink
Merge pull request #77 from valkey-io/aiven-sal/fixasynctest
Browse files Browse the repository at this point in the history
Fix issue with pytest-asyncio v0.24
  • Loading branch information
aiven-sal authored Aug 23, 2024
2 parents 3fa55e9 + 2f43edf commit 49214c5
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions tests/test_asyncio/test_scripting.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,12 @@ async def r(self, create_valkey):
yield valkey
await valkey.script_flush()

@pytest.mark.asyncio(forbid_global_loop=True)
async def test_eval(self, r):
await r.flushdb()
await r.set("a", 2)
# 2 * 3 == 6
assert await r.eval(multiply_script, 1, "a", 3) == 6

@pytest.mark.asyncio(forbid_global_loop=True)
@skip_if_server_version_lt("6.2.0")
async def test_script_flush(self, r):
await r.set("a", 2)
Expand All @@ -55,14 +53,12 @@ async def test_script_flush(self, r):
await r.script_load(multiply_script)
await r.script_flush("NOTREAL")

@pytest.mark.asyncio(forbid_global_loop=True)
async def test_evalsha(self, r):
await r.set("a", 2)
sha = await r.script_load(multiply_script)
# 2 * 3 == 6
assert await r.evalsha(sha, 1, "a", 3) == 6

@pytest.mark.asyncio(forbid_global_loop=True)
async def test_evalsha_script_not_loaded(self, r):
await r.set("a", 2)
sha = await r.script_load(multiply_script)
Expand All @@ -71,7 +67,6 @@ async def test_evalsha_script_not_loaded(self, r):
with pytest.raises(exceptions.NoScriptError):
await r.evalsha(sha, 1, "a", 3)

@pytest.mark.asyncio(forbid_global_loop=True)
async def test_script_loading(self, r):
# get the sha, then clear the cache
sha = await r.script_load(multiply_script)
Expand All @@ -80,7 +75,6 @@ async def test_script_loading(self, r):
await r.script_load(multiply_script)
assert await r.script_exists(sha) == [True]

@pytest.mark.asyncio(forbid_global_loop=True)
async def test_script_object(self, r):
await r.script_flush()
await r.set("a", 2)
Expand All @@ -97,7 +91,6 @@ async def test_script_object(self, r):
# Test first evalsha block
assert await multiply(keys=["a"], args=[3]) == 6

@pytest.mark.asyncio(forbid_global_loop=True)
async def test_script_object_in_pipeline(self, r):
await r.script_flush()
multiply = r.register_script(multiply_script)
Expand Down Expand Up @@ -127,7 +120,6 @@ async def test_script_object_in_pipeline(self, r):
assert await pipe.execute() == [True, b"2", 6]
assert await r.script_exists(multiply.sha) == [True]

@pytest.mark.asyncio(forbid_global_loop=True)
async def test_eval_msgpack_pipeline_error_in_lua(self, r):
msgpack_hello = r.register_script(msgpack_hello_script)
assert msgpack_hello.sha
Expand Down

0 comments on commit 49214c5

Please sign in to comment.