Skip to content

Commit

Permalink
adds isclose checks to flaky geotests
Browse files Browse the repository at this point in the history 
- add geochecks to conftest
- uses isclose to check float values
- renamed check to assert_geo_is_close
- update_assert_is_geo_tests
- format with black
- updates from pr

Signed-off-by: Jay Miller <kjaymiller@gmail.com>
  • Loading branch information
@kjaymiller
kjaymiller committed Aug 6, 2024
1 parent 67eb77c commit 903fa5b
Show file tree
Hide file tree
Showing 3 changed files with 206 additions and 159 deletions.
23 changes: 23 additions & 0 deletions tests/conftest.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import argparse
import math
import time
from typing import Callable, TypeVar
from unittest import mock
Expand Down Expand Up @@ -493,6 +494,28 @@ def assert_resp_response(r, response, resp2_expected, resp3_expected):
assert response == resp3_expected


def assert_geo_is_close(coords, expected_coords):
"""
Verifies that the coordinates are close within the floating point tolerance
Valkey uses 52-bit presicion
"""
for a, b in zip(coords, expected_coords):
assert math.isclose(a, b)


def assert_resp_response_isclose(r, response, resp2_expected, resp3_expected):
"""Verifies that the responses are close within the floating point tolerance"""
protocol = get_protocol_version(r)

if protocol in [2, "2", None]:
assert_geo_is_close(response[0], resp2_expected[0])
assert response[1:] == resp2_expected[1:]
else:
assert_geo_is_close(response[0], resp3_expected[0])
assert response[1:] == resp3_expected[1:]


def assert_resp_response_in(r, response, resp2_expected, resp3_expected):
protocol = get_protocol_version(r)
if protocol in [2, "2", None]:
Expand Down
108 changes: 62 additions & 46 deletions tests/test_asyncio/test_commands.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import asyncio
import binascii
import datetime
import math
import re
import sys
from string import ascii_letters
Expand All @@ -13,8 +14,10 @@
import pytest_asyncio
import valkey
from tests.conftest import (
assert_geo_is_close,
assert_resp_response,
assert_resp_response_in,
assert_resp_response_isclose,
is_resp2_connection,
skip_if_server_version_gte,
skip_if_server_version_lt,
Expand Down Expand Up @@ -634,7 +637,7 @@ async def test_bitop_not_empty_string(self, r: valkey.Valkey):
@skip_if_server_version_lt("2.6.0")
@pytest.mark.onlynoncluster
async def test_bitop_not(self, r: valkey.Valkey):
test_str = b"\xAA\x00\xFF\x55"
test_str = b"\xaa\x00\xff\x55"
correct = ~0xAA00FF55 & 0xFFFFFFFF
await r.set("a", test_str)
await r.bitop("not", "r", "a")
Expand All @@ -643,7 +646,7 @@ async def test_bitop_not(self, r: valkey.Valkey):
@skip_if_server_version_lt("2.6.0")
@pytest.mark.onlynoncluster
async def test_bitop_not_in_place(self, r: valkey.Valkey):
test_str = b"\xAA\x00\xFF\x55"
test_str = b"\xaa\x00\xff\x55"
correct = ~0xAA00FF55 & 0xFFFFFFFF
await r.set("a", test_str)
await r.bitop("not", "a", "a")
Expand All @@ -652,7 +655,7 @@ async def test_bitop_not_in_place(self, r: valkey.Valkey):
@skip_if_server_version_lt("2.6.0")
@pytest.mark.onlynoncluster
async def test_bitop_single_string(self, r: valkey.Valkey):
test_str = b"\x01\x02\xFF"
test_str = b"\x01\x02\xff"
await r.set("a", test_str)
await r.bitop("and", "res1", "a")
await r.bitop("or", "res2", "a")
Expand All @@ -664,8 +667,8 @@ async def test_bitop_single_string(self, r: valkey.Valkey):
@skip_if_server_version_lt("2.6.0")
@pytest.mark.onlynoncluster
async def test_bitop_string_operands(self, r: valkey.Valkey):
await r.set("a", b"\x01\x02\xFF\xFF")
await r.set("b", b"\x01\x02\xFF")
await r.set("a", b"\x01\x02\xff\xff")
await r.set("b", b"\x01\x02\xff")
await r.bitop("and", "res1", "a", "b")
await r.bitop("or", "res2", "a", "b")
await r.bitop("xor", "res3", "a", "b")
Expand Down Expand Up @@ -2459,7 +2462,7 @@ async def test_geopos(self, r: valkey.Valkey):

await r.geoadd("barcelona", values)
# valkey uses 52 bits precision, hereby small errors may be introduced.
assert_resp_response(
assert_resp_response_isclose(
r,
await r.geopos("barcelona", "place1", "place2"),
[
Expand Down Expand Up @@ -2519,7 +2522,30 @@ async def test_georadius_units(self, r: valkey.Valkey):

@skip_unless_arch_bits(64)
@skip_if_server_version_lt("3.2.0")
async def test_georadius_with(self, r: valkey.Valkey):
@pytest.mark.parametrize(
"georadius_kwargs, expected_georadius_result",
[
(
{"withdist": True, "withcoord": True, "withhash": True},
[b"place1", 0.0881, 3471609698139488],
),
(
{"withdist": True, "withcoord": True},
[b"place1", 0.0881],
),
(
{"withhash": True, "withcoord": True},
[b"place1", 3471609698139488],
),
(
{"withdist": True, "withhash": True},
[b"place1", 0.0881, 3471609698139488],
),
],
)
async def test_georadius_with(
self, r: valkey.Valkey, georadius_kwargs, expected_georadius_result
):
values = (2.1909389952632, 41.433791470673, "place1") + (
2.1873744593677,
41.406342043777,
Expand All @@ -2530,33 +2556,23 @@ async def test_georadius_with(self, r: valkey.Valkey):

# test a bunch of combinations to test the parse response
# function.
assert await r.georadius(
georadius_result = await r.georadius(
"barcelona",
2.191,
41.433,
1,
unit="km",
withdist=True,
withcoord=True,
withhash=True,
) == [
[
b"place1",
0.0881,
3471609698139488,
(2.19093829393386841, 41.43379028184083523),
]
]

assert await r.georadius(
"barcelona", 2.191, 41.433, 1, unit="km", withdist=True, withcoord=True
) == [[b"place1", 0.0881, (2.19093829393386841, 41.43379028184083523)]]
**georadius_kwargs,
)

assert await r.georadius(
"barcelona", 2.191, 41.433, 1, unit="km", withhash=True, withcoord=True
) == [
[b"place1", 3471609698139488, (2.19093829393386841, 41.43379028184083523)]
]
assert len(georadius_result) == 1
if "withcoord" in georadius_kwargs:
assert_geo_is_close(
georadius_result[0][-1], (2.19093829393386841, 41.43379028184083523)
)
assert georadius_result[0][:-1] == expected_georadius_result
else:
assert georadius_result == [expected_georadius_result]

# test no values.
assert (
Expand All @@ -2566,9 +2582,7 @@ async def test_georadius_with(self, r: valkey.Valkey):
1,
1,
unit="km",
withdist=True,
withcoord=True,
withhash=True,
**georadius_kwargs,
)
== []
)
Expand Down Expand Up @@ -2632,7 +2646,8 @@ async def test_georadius_store_dist(self, r: valkey.Valkey):
"barcelona", 2.191, 41.433, 1000, store_dist="places_barcelona"
)
# instead of save the geo score, the distance is saved.
assert await r.zscore("places_barcelona", "place1") == 88.05060698409301
z_score = await r.zscore("places_barcelona", "place1")
assert math.isclose(z_score, 88.05060698409301)

@skip_unless_arch_bits(64)
@skip_if_server_version_lt("3.2.0")
Expand All @@ -2650,21 +2665,22 @@ async def test_georadiusmember(self, r: valkey.Valkey):
]
assert await r.georadiusbymember("barcelona", "place1", 10) == [b"place1"]

assert await r.georadiusbymember(
radius_place2, radius_place1 = await r.georadiusbymember(
"barcelona", "place1", 4000, withdist=True, withcoord=True, withhash=True
) == [
[
b"\x80place2",
3067.4157,
3471609625421029,
(2.187376320362091, 41.40634178640635),
],
[
b"place1",
0.0,
3471609698139488,
(2.1909382939338684, 41.433790281840835),
],
)

assert_geo_is_close(radius_place2[-1], (2.187376320362091, 41.40634178640635))
assert radius_place2[:-1] == [
b"\x80place2",
3067.4157,
3471609625421029,
]

assert_geo_is_close(radius_place1[-1], (2.1909382939338684, 41.433790281840835))
assert radius_place1[:-1] == [
b"place1",
0.0,
3471609698139488,
]

@skip_if_server_version_lt("5.0.0")
Expand Down
Loading

0 comments on commit 903fa5b

Please sign in to comment.