Skip to content

Simplify SxPB setup parsing to requests-only format #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grencez merged 1 commit into from
Feb 23, 2026
Merged

Simplify SxPB setup parsing to requests-only format #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions test/server_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,6 @@
from typing import Any, Dict, List, cast


def normalize_list(obj: Any) -> List[Any]:
if obj is None:
return []
if isinstance(obj, list):
return obj
return [obj]


class TestServerSxPB(unittest.TestCase):
def test_sxpb_cases(self):
sxpb_path = os.path.join(os.path.dirname(__file__), "server_test_cases.sxpb")
Expand All @@ -32,8 +24,7 @@ def test_sxpb_cases(self):
# Setup phase
setup_block = case.get("setup", {})
if setup_block:
setup_requests = normalize_list(setup_block.get("request"))
for req in setup_requests:
for req in cast(List[Dict[str, Any]], setup_block.get("requests", [])):
self._run_request(impl, req, now_ms)

# Request phase
Expand Down Expand Up @@ -79,7 +70,7 @@ def _run_request(self, impl: RendezqueueImpl, req: Dict[str, Any], now_ms: float
msg["b64"] = req["b64"]

if "values" in req:
msg["values"] = normalize_list(req["values"])
msg["values"] = req["values"]

return impl.tryswap(msg, now_ms=now_ms)

Expand Down Expand Up @@ -109,9 +100,8 @@ def _verify_response(self, actual, expected, case_name):
pass

if "values" in expected:
expected_values = normalize_list(expected["values"])
self.assertEqual(
actual.values, expected_values, f"Case {case_name}: Values mismatch"
actual.values, expected["values"], f"Case {case_name}: Values mismatch"
)
else:
# Expect no values
Expand Down
84 changes: 46 additions & 38 deletions test/server_test_cases.sxpb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@
(()
(name "2. Match existing offer")
(setup
(request
(key "k1")
(sid "s1")
(offset 0)
(values (()) "val1")
(ttl 10)
(requests (())
(()
(key "k1")
(sid "s1")
(offset 0)
(values (()) "val1")
(ttl 10)
)
)
)
(now_ms 1000)
Expand All @@ -48,19 +50,21 @@
(()
(name "3. Poll matched offer (s1)")
(setup
(request
(key "k1")
(sid "s1")
(offset 0)
(values (()) "val1")
(ttl 10)
)
(request
(key "k1")
(sid "s2")
(offset 0)
(values (()) "val2")
(ttl 10)
(requests (())
(()
(key "k1")
(sid "s1")
(offset 0)
(values (()) "val1")
(ttl 10)
)
(()
(key "k1")
(sid "s2")
(offset 0)
(values (()) "val2")
(ttl 10)
)
)
)
(now_ms 1000)
Expand All @@ -80,12 +84,14 @@
(()
(name "4. Partial match / Append")
(setup
(request
(key "k1")
(sid "s1")
(offset 0)
(values (()) "v1")
(ttl 10)
(requests (())
(()
(key "k1")
(sid "s1")
(offset 0)
(values (()) "v1")
(ttl 10)
)
)
)
(now_ms 1000)
Expand Down Expand Up @@ -138,19 +144,21 @@
(()
(name "7. Multiple values swap")
(setup
(request
(key "k_multi")
(sid "s_multi_1")
(offset 0)
(values (()) "val_a1")
(ttl 10)
)
(request
(key "k_multi")
(sid "s_multi_1")
(offset 1)
(values (()) "val_a2")
(ttl 10)
(requests (())
(()
(key "k_multi")
(sid "s_multi_1")
(offset 0)
(values (()) "val_a1")
(ttl 10)
)
(()
(key "k_multi")
(sid "s_multi_1")
(offset 1)
(values (()) "val_a2")
(ttl 10)
)
)
)
(now_ms 1000)
Expand Down