fixing broken tests

Author: chinacat567

src/dicomweb_client/web.py

@@ -2101,7 +2101,7 @@ def retrieve_study_metadata(
         study_instance_uid: str
             Study Instance UID
         additional_params: Union[Dict[str, Any], None], optional
-            Additional HTTP GET query parameters 
+            Additional HTTP GET query parameters
 
         Returns
         -------
@@ -3013,10 +3013,10 @@ def _get_instance_frames(
         url += f'/frames/{frame_list}'
         if media_types is None:
             return self._http_get_multipart(
-                url, 
+                url,
                 stream=stream,
                 params=additional_params
-                )
+            )
 
         common_media_types = self._get_common_media_types(media_types)
         if len(common_media_types) > 1:

tests/test_web.py

@@ -1,5 +1,4 @@
 import json
-from operator import add
 import xml.etree.ElementTree as ET
 from io import BytesIO
 from http import HTTPStatus
@@ -137,18 +136,24 @@ def test_search_for_studies(httpserver, client, cache_dir):
     )
 
 
-def test_search_for_studies_with_additional_params(httpserver, client, cache_dir):
+def test_search_for_studies_with_additional_params(
+        httpserver,
+        client,
+        cache_dir
+):
     cache_filename = str(cache_dir.joinpath('search_for_studies.json'))
     with open(cache_filename, 'r') as f:
         content = f.read()
     parsed_content = json.loads(content)
     headers = {'content-type': 'application/dicom+json'}
     httpserver.serve_content(content=content, code=200, headers=headers)
-    params = {"key1" : ["value1", "value2"], "key2" : "value3"}
+    params = {"key1": ["value1", "value2"], "key2": "value3"}
     assert client.search_for_studies(additional_params=params) == parsed_content
     request = httpserver.requests[0]
     assert request.path == '/studies'
-    assert request.query_string.decode() == 'key1=value1&key1=value2&key2=value3'
+    assert request.query_string.decode() == (
+        'key1=value1&key1=value2&key2=value3'
+    )
     assert all(
         mime[0] in ('application/json', 'application/dicom+json')
         for mime in request.accept_mimetypes
@@ -236,18 +241,24 @@ def test_search_for_series(httpserver, client, cache_dir):
     )
 
 
-def test_search_for_series_with_additional_params(httpserver, client, cache_dir):
+def test_search_for_series_with_additional_params(
+        httpserver,
+        client,
+        cache_dir
+):
     cache_filename = str(cache_dir.joinpath('search_for_series.json'))
     with open(cache_filename, 'r') as f:
         content = f.read()
     parsed_content = json.loads(content)
     headers = {'content-type': 'application/dicom+json'}
     httpserver.serve_content(content=content, code=200, headers=headers)
-    params = {"key1" : ["value1", "value2"], "key2" : "value3"}
+    params = {"key1": ["value1", "value2"], "key2": "value3"}
     assert client.search_for_series(additional_params=params) == parsed_content
     request = httpserver.requests[0]
     assert request.path == '/series'
-    assert request.query_string.decode() == 'key1=value1&key1=value2&key2=value3'
+    assert request.query_string.decode() == (
+        'key1=value1&key1=value2&key2=value3'
+    )
     assert all(
         mime[0] in ('application/json', 'application/dicom+json')
         for mime in request.accept_mimetypes
@@ -325,18 +336,26 @@ def test_search_for_instances(httpserver, client, cache_dir):
     )
 
 
-def test_search_for_instances_with_additional_params(httpserver, client, cache_dir):
+def test_search_for_instances_with_additional_params(
+        httpserver,
+        client,
+        cache_dir
+):
     cache_filename = str(cache_dir.joinpath('search_for_instances.json'))
     with open(cache_filename, 'r') as f:
         content = f.read()
     parsed_content = json.loads(content)
     headers = {'content-type': 'application/dicom+json'}
     httpserver.serve_content(content=content, code=200, headers=headers)
-    params = {"key1" : ["value1", "value2"], "key2" : "value3"}
-    assert client.search_for_instances(additional_params=params) == parsed_content
+    params = {"key1": ["value1", "value2"], "key2": "value3"}
+    assert client.search_for_instances(
+        additional_params=params
+    ) == parsed_content
     request = httpserver.requests[0]
     assert request.path == '/instances'
-    assert request.query_string.decode() == 'key1=value1&key1=value2&key2=value3'
+    assert request.query_string.decode() == (
+        'key1=value1&key1=value2&key2=value3'
+    )
     assert all(
         mime[0] in ('application/json', 'application/dicom+json')
         for mime in request.accept_mimetypes
@@ -435,23 +454,32 @@ def test_retrieve_instance_metadata(httpserver, client, cache_dir):
     )
 
 
-def test_retrieve_instance_metadata_with_additional_params(httpserver, client, cache_dir):
+def test_retrieve_instance_metadata_with_additional_params(
+        httpserver,
+        client,
+        cache_dir
+):
     cache_filename = str(cache_dir.joinpath('retrieve_instance_metadata.json'))
     with open(cache_filename, 'r') as f:
         content = f.read()
     parsed_content = json.loads(content)
     headers = {'content-type': 'application/dicom+json'}
     httpserver.serve_content(content=content, code=200, headers=headers)
-    params = {"key1" : ["value1", "value2"], "key2" : "value3"}
+    params = {"key1": ["value1", "value2"], "key2": "value3"}
     study_instance_uid = '1.2.3'
     series_instance_uid = '1.2.4'
     sop_instance_uid = '1.2.5'
     result = client.retrieve_instance_metadata(
-        study_instance_uid, series_instance_uid, sop_instance_uid, additional_params=params
+        study_instance_uid,
+        series_instance_uid,
+        sop_instance_uid,
+        additional_params=params
     )
     assert result == parsed_content[0]
     request = httpserver.requests[0]
-    assert request.query_string.decode() == 'key1=value1&key1=value2&key2=value3'
+    assert request.query_string.decode() == (
+        'key1=value1&key1=value2&key2=value3'
+    )
     expected_path = (
         f'/studies/{study_instance_uid}'
         f'/series/{series_instance_uid}'
@@ -603,7 +631,12 @@ def test_retrieve_instance(httpserver, client, cache_dir):
     assert request.path == expected_path
     assert request.accept_mimetypes[0][0][:43] == headers['content-type'][:43]
 
-def test_retrieve_instance_with_additional_params(httpserver, client, cache_dir):
+
+def test_retrieve_instance_with_additional_params(
+        httpserver,
+        client,
+        cache_dir
+):
     cache_filename = str(cache_dir.joinpath('file.dcm'))
     with open(cache_filename, 'rb') as f:
         data = f.read()
@@ -621,19 +654,24 @@ def test_retrieve_instance_with_additional_params(httpserver, client, cache_dir)
         content_type=headers['content-type']
     )
     httpserver.serve_content(content=message, code=200, headers=headers)
-    params = {"key1" : ["value1", "value2"], "key2" : "value3"}
+    params = {"key1": ["value1", "value2"], "key2": "value3"}
     study_instance_uid = '1.2.3'
     series_instance_uid = '1.2.4'
     sop_instance_uid = '1.2.5'
     response = client.retrieve_instance(
-        study_instance_uid, series_instance_uid, sop_instance_uid, additional_params=params
+        study_instance_uid,
+        series_instance_uid,
+        sop_instance_uid,
+        additional_params=params
     )
     with BytesIO() as fp:
         pydicom.dcmwrite(fp, response)
         raw_result = fp.getvalue()
     assert raw_result == data
     request = httpserver.requests[0]
-    assert request.query_string.decode() == 'key1=value1&key1=value2&key2=value3'
+    assert request.query_string.decode() == (
+        'key1=value1&key1=value2&key2=value3'
+    )
     expected_path = (
         f'/studies/{study_instance_uid}'
         f'/series/{series_instance_uid}'