Skip to content

Commit b5b0df3

Browse files
committed
fix tests
1 parent 3864de0 commit b5b0df3

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

tests/unit/test_reductionist.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import sys
33
from unittest import mock
44

5-
import json
5+
import cbor2 as cbor
66
import numcodecs
77
import numpy as np
88
import pytest
@@ -13,16 +13,17 @@
1313

1414
def make_response(content, status_code, dtype=None, shape=None, count=None):
1515
reduction_result = {
16-
"bytes": list(content)
16+
"bytes": content
1717
}
1818
if dtype:
1919
reduction_result["dtype"] = dtype
2020
if shape:
2121
reduction_result["shape"] = shape
2222
if count:
2323
reduction_result["count"] = count
24+
print("Reduction result", reduction_result)
2425
response = requests.Response()
25-
response._content = json.dumps(reduction_result)
26+
response._content = cbor.dumps(reduction_result)
2627
response.status_code = status_code
2728
return response
2829

@@ -67,15 +68,15 @@ def test_reduce_chunk_defaults(mock_request):
6768
assert tmp == result
6869
assert count == 2
6970

70-
expected_url = f"{active_url}/v1/{operation}/"
71+
expected_url = f"{active_url}/v2/{operation}/"
7172
expected_data = {
7273
"source": s3_url,
7374
"bucket": bucket,
7475
"object": object,
7576
"dtype": "int32",
77+
"byte_order": sys.byteorder,
7678
'offset': 0,
7779
'size': 0,
78-
"byte_order": sys.byteorder,
7980
}
8081
mock_request.assert_called_once_with(session, expected_url, expected_data)
8182

@@ -122,7 +123,7 @@ def test_reduce_chunk_compression(mock_request, compression, filters):
122123
assert tmp == result
123124
assert count == 2
124125

125-
expected_url = f"{active_url}/v1/{operation}/"
126+
expected_url = f"{active_url}/v2/{operation}/"
126127
expected_data = {
127128
"source":
128129
s3_url,
@@ -238,7 +239,7 @@ def test_reduce_chunk_missing(mock_request, missing):
238239
assert tmp == result
239240
assert count == 2
240241

241-
expected_url = f"{active_url}/v1/{operation}/"
242+
expected_url = f"{active_url}/v2/{operation}/"
242243
expected_data = {
243244
"source":
244245
s3_url,
@@ -304,4 +305,5 @@ def test_reduce_chunk_not_found(mock_request):
304305
dtype, shape, order, chunk_selection, axis,
305306
operation)
306307

307-
assert str(exc.value) == 'Reductionist error: HTTP 404: "Not found"'
308+
print("Not found exc from reductionist", str(exc.value))
309+
assert str(exc.value) == 'Reductionist error: HTTP 404: -'

0 commit comments

Comments
 (0)