|
2 | 2 | import sys |
3 | 3 | from unittest import mock |
4 | 4 |
|
5 | | -import json |
| 5 | +import cbor2 as cbor |
6 | 6 | import numcodecs |
7 | 7 | import numpy as np |
8 | 8 | import pytest |
|
13 | 13 |
|
14 | 14 | def make_response(content, status_code, dtype=None, shape=None, count=None): |
15 | 15 | reduction_result = { |
16 | | - "bytes": list(content) |
| 16 | + "bytes": content |
17 | 17 | } |
18 | 18 | if dtype: |
19 | 19 | reduction_result["dtype"] = dtype |
20 | 20 | if shape: |
21 | 21 | reduction_result["shape"] = shape |
22 | 22 | if count: |
23 | 23 | reduction_result["count"] = count |
| 24 | + print("Reduction result", reduction_result) |
24 | 25 | response = requests.Response() |
25 | | - response._content = json.dumps(reduction_result) |
| 26 | + response._content = cbor.dumps(reduction_result) |
26 | 27 | response.status_code = status_code |
27 | 28 | return response |
28 | 29 |
|
@@ -67,15 +68,15 @@ def test_reduce_chunk_defaults(mock_request): |
67 | 68 | assert tmp == result |
68 | 69 | assert count == 2 |
69 | 70 |
|
70 | | - expected_url = f"{active_url}/v1/{operation}/" |
| 71 | + expected_url = f"{active_url}/v2/{operation}/" |
71 | 72 | expected_data = { |
72 | 73 | "source": s3_url, |
73 | 74 | "bucket": bucket, |
74 | 75 | "object": object, |
75 | 76 | "dtype": "int32", |
| 77 | + "byte_order": sys.byteorder, |
76 | 78 | 'offset': 0, |
77 | 79 | 'size': 0, |
78 | | - "byte_order": sys.byteorder, |
79 | 80 | } |
80 | 81 | mock_request.assert_called_once_with(session, expected_url, expected_data) |
81 | 82 |
|
@@ -122,7 +123,7 @@ def test_reduce_chunk_compression(mock_request, compression, filters): |
122 | 123 | assert tmp == result |
123 | 124 | assert count == 2 |
124 | 125 |
|
125 | | - expected_url = f"{active_url}/v1/{operation}/" |
| 126 | + expected_url = f"{active_url}/v2/{operation}/" |
126 | 127 | expected_data = { |
127 | 128 | "source": |
128 | 129 | s3_url, |
@@ -238,7 +239,7 @@ def test_reduce_chunk_missing(mock_request, missing): |
238 | 239 | assert tmp == result |
239 | 240 | assert count == 2 |
240 | 241 |
|
241 | | - expected_url = f"{active_url}/v1/{operation}/" |
| 242 | + expected_url = f"{active_url}/v2/{operation}/" |
242 | 243 | expected_data = { |
243 | 244 | "source": |
244 | 245 | s3_url, |
@@ -304,4 +305,5 @@ def test_reduce_chunk_not_found(mock_request): |
304 | 305 | dtype, shape, order, chunk_selection, axis, |
305 | 306 | operation) |
306 | 307 |
|
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