mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-05 14:33:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

test/nodetool: add body parameter to expected_request

Browse Source 
before this change, `expected_request` only includes query strings
for the parameters of requests. but we will add an API
("storage_service/restore") which accepts its parameters in HTTP body
as well.

in this change, we add an optional `body` member to `expected_request`,
so that we can mock the APIs which pass the parameters with the HTTP
body.

Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>
This commit is contained in:
Kefu Chai
2024-09-18 21:41:50 +08:00
parent 3c19cc9aec
commit 283697e316
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/nodetool/rest_api_mock.py
View File

@@ -43,11 +43,12 @@ class expected_request:
ONE = 0 # exactly one request is allowed
MULTIPLE = 1 # one or more request is allowed
def __init__(self, method: str, path: str, params: dict = {}, multiple: int = ONE,
def __init__(self, method: str, path: str, params: dict = {}, body: Any = None, multiple: int = ONE,
response: Dict[str, Any] = None, response_status: int = 200, hit: int = 0):
self.method = method
self.path = path.rstrip("/")
self.params = params
self.body = body
self.multiple = multiple
self.response = response
self.response_status = response_status
@@ -65,12 +66,13 @@ class expected_request:
"path": self.path,
"multiple": self.multiple,
"params": {k: param_to_json(v) for k, v in self.params.items()},
"body": self.body,
"response": self.response,
"response_status": self.response_status,
"hit": self.hit}
def __eq__(self, o):
return self.method == o.method and self.path == o.path and self.params == o.params
return self.method == o.method and self.path == o.path and self.params == o.params and self.body == o.body
def __str__(self):
return json.dumps(self.as_json())
@@ -95,6 +97,7 @@ def _make_expected_request(req_json):
req_json["method"],
req_json["path"],
params={k: _make_param_value(v) for k, v in req_json.get("params", dict()).items()},
body=req_json.get("body"),
multiple=req_json.get("multiple", expected_request.ONE),
response=req_json.get("response"),
response_status=req_json.get("response_status", 200),
@@ -140,7 +143,12 @@ class rest_server():
self.unexpected_requests += 1
return aiohttp.web.Response(status=404, text=f"Request {request_key} not found in expected requests")
this_req = expected_request(request.method, request.path, params=dict(request.query))
body = None
if request.can_read_body:
# only JSON-encoded payload is supported
body = await request.json()
this_req = expected_request(request.method, request.path, params=dict(request.query), body=body)
if len(expected_requests) == 0:
self.unexpected_requests += 1