Skip to content

Commit e371cee

Browse files
committed
Fix Reductionist unit tests
1 parent 432fc4f commit e371cee

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

activestorage/reductionist.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,11 +235,11 @@ def request(session: requests.Session, url: str, request_data: dict):
235235

236236
def decode_result(response):
237237
"""Decode a successful response, return as a 2-tuple of (numpy array or scalar, count)."""
238-
reduction_result = response.json()
238+
reduction_result = json.loads(response.content)
239239
print("Reduction result: ", reduction_result)
240240
print("Reduction result size: ", sys.getsizeof(reduction_result))
241241
dtype = reduction_result['dtype']
242-
shape = reduction_result['shape']
242+
shape = reduction_result['shape'] if "shape" in reduction_result else None
243243

244244
# Result
245245
result = np.frombuffer(bytes(reduction_result['bytes']), dtype=dtype)

tests/unit/test_reductionist.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
def make_response(content, status_code, dtype=None, shape=None, count=None):
1515
reduction_result = {
16-
"bytes": content
16+
"bytes": list(content)
1717
}
1818
if dtype:
1919
reduction_result["dtype"] = dtype
@@ -31,7 +31,7 @@ def make_response(content, status_code, dtype=None, shape=None, count=None):
3131
def test_reduce_chunk_defaults(mock_request):
3232
"""Unit test for reduce_chunk with default arguments."""
3333
result = np.int32(134351386)
34-
response = make_response(result.tobytes(), 200, "int32", "[]", "2")
34+
response = make_response(result.tobytes(), 200, "int32", [], 2)
3535
mock_request.return_value = response
3636

3737
active_url = "https://s3.example.com"
@@ -90,7 +90,7 @@ def test_reduce_chunk_defaults(mock_request):
9090
def test_reduce_chunk_compression(mock_request, compression, filters):
9191
"""Unit test for reduce_chunk with compression and filter arguments."""
9292
result = np.int32(134351386)
93-
response = make_response(result.tobytes(), 200, "int32", "[]", "2")
93+
response = make_response(result.tobytes(), 200, "int32", [], 2)
9494
mock_request.return_value = response
9595

9696
active_url = "https://s3.example.com"
@@ -206,7 +206,7 @@ def test_reduce_chunk_missing(mock_request, missing):
206206
reduce_arg, api_arg = missing
207207

208208
result = np.float32(-42.)
209-
response = make_response(result.tobytes(), 200, "float32", "[]", "2")
209+
response = make_response(result.tobytes(), 200, "float32", [], 2)
210210
mock_request.return_value = response
211211

212212
active_url = "https://s3.example.com"

0 commit comments

Comments
 (0)