Skip to content

Commit

Permalink
Fix tests for python version 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@hackermd
hackermd committed Feb 15, 2020
1 parent a842609 commit 35a0540
Showing 1 changed file with 21 additions and 20 deletions.
41 changes: 21 additions & 20 deletions tests/test_api.py
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import os
import json
import xml.etree.ElementTree as ET
from io import BytesIO
Expand Down Expand Up @@ -79,7 +80,7 @@ def test_lookup_keyword(httpserver, client):


def test_search_for_studies(httpserver, client, cache_dir):
cache_filename = cache_dir.joinpath('search_for_studies.json')
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)
Expand All @@ -96,7 +97,7 @@ def test_search_for_studies(httpserver, client, cache_dir):

def test_search_for_studies_qido_prefix(httpserver, client, cache_dir):
client.qido_url_prefix = 'qidors'
cache_filename = cache_dir.joinpath('search_for_studies.json')
cache_filename = str(cache_dir.joinpath('search_for_studies.json'))
with open(cache_filename, 'r') as f:
content = f.read()
headers = {'content-type': 'application/dicom+json'}
Expand All @@ -107,7 +108,7 @@ def test_search_for_studies_qido_prefix(httpserver, client, cache_dir):


def test_search_for_studies_limit_offset(httpserver, client, cache_dir):
cache_filename = cache_dir.joinpath('search_for_studies.json')
cache_filename = str(cache_dir.joinpath('search_for_studies.json'))
with open(cache_filename, 'r') as f:
data = json.loads(f.read())
# We will limit the search to 2 studies starting with the 2nd.
Expand All @@ -129,7 +130,7 @@ def test_search_for_studies_limit_offset(httpserver, client, cache_dir):


def test_search_for_series(httpserver, client, cache_dir):
cache_filename = cache_dir.joinpath('search_for_series.json')
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)
Expand Down Expand Up @@ -157,7 +158,7 @@ def test_search_for_series_wrong_uid_value(httpserver, client, cache_dir):


def test_search_for_series_limit_offset(httpserver, client, cache_dir):
cache_filename = cache_dir.joinpath('search_for_series.json')
cache_filename = str(cache_dir.joinpath('search_for_series.json'))
with open(cache_filename, 'r') as f:
data = json.loads(f.read())
content = json.dumps(data[1:3])
Expand All @@ -178,7 +179,7 @@ def test_search_for_series_limit_offset(httpserver, client, cache_dir):


def test_search_for_instances(httpserver, client, cache_dir):
cache_filename = cache_dir.joinpath('search_for_instances.json')
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)
Expand All @@ -194,7 +195,7 @@ def test_search_for_instances(httpserver, client, cache_dir):


def test_search_for_instances_limit_offset(httpserver, client, cache_dir):
cache_filename = cache_dir.joinpath('search_for_instances.json')
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)
Expand Down Expand Up @@ -234,7 +235,7 @@ def test_search_for_instances_includefields(httpserver, client, cache_dir):


def test_retrieve_instance_metadata(httpserver, client, cache_dir):
cache_filename = cache_dir.joinpath('retrieve_instance_metadata.json')
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)
Expand All @@ -261,7 +262,7 @@ def test_retrieve_instance_metadata(httpserver, client, cache_dir):

def test_retrieve_instance_metadata_wado_prefix(httpserver, client, cache_dir):
client.wado_url_prefix = 'wadors'
cache_filename = cache_dir.joinpath('retrieve_instance_metadata.json')
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)
Expand All @@ -283,7 +284,7 @@ def test_retrieve_instance_metadata_wado_prefix(httpserver, client, cache_dir):


def test_retrieve_instance(httpserver, client, cache_dir):
cache_filename = cache_dir.joinpath('file.dcm')
cache_filename = str(cache_dir.joinpath('file.dcm'))
with open(cache_filename, 'rb') as f:
content = f.read()
headers = {
Expand Down Expand Up @@ -313,7 +314,7 @@ def test_retrieve_instance(httpserver, client, cache_dir):


def test_retrieve_instance_any_transfer_syntax(httpserver, client, cache_dir):
cache_filename = cache_dir.joinpath('file.dcm')
cache_filename = str(cache_dir.joinpath('file.dcm'))
with open(cache_filename, 'rb') as f:
content = f.read()
headers = {
Expand All @@ -335,7 +336,7 @@ def test_retrieve_instance_any_transfer_syntax(httpserver, client, cache_dir):

def test_retrieve_instance_default_transfer_syntax(httpserver, client,
cache_dir):
cache_filename = cache_dir.joinpath('file.dcm')
cache_filename = str(cache_dir.joinpath('file.dcm'))
with open(cache_filename, 'rb') as f:
content = f.read()
headers = {
Expand All @@ -356,7 +357,7 @@ def test_retrieve_instance_default_transfer_syntax(httpserver, client,


def test_retrieve_instance_wrong_transfer_syntax(httpserver, client, cache_dir):
cache_filename = cache_dir.joinpath('file.dcm')
cache_filename = str(cache_dir.joinpath('file.dcm'))
with open(cache_filename, 'rb') as f:
content = f.read()
headers = {
Expand All @@ -376,7 +377,7 @@ def test_retrieve_instance_wrong_transfer_syntax(httpserver, client, cache_dir):


def test_retrieve_instance_wrong_mime_type(httpserver, client, cache_dir):
cache_filename = cache_dir.joinpath('file.dcm')
cache_filename = str(cache_dir.joinpath('file.dcm'))
with open(cache_filename, 'rb') as f:
content = f.read()
headers = {
Expand All @@ -396,7 +397,7 @@ def test_retrieve_instance_wrong_mime_type(httpserver, client, cache_dir):


def test_retrieve_instance_frames_jpeg(httpserver, client, cache_dir):
cache_filename = cache_dir.joinpath('retrieve_instance_pixeldata.jpg')
cache_filename = str(cache_dir.joinpath('retrieve_instance_pixeldata.jpg'))
with open(cache_filename, 'rb') as f:
content = f.read()
headers = {
Expand Down Expand Up @@ -425,7 +426,7 @@ def test_retrieve_instance_frames_jpeg(httpserver, client, cache_dir):
def test_retrieve_instance_frames_jpeg_default_transfer_syntax(httpserver,
client,
cache_dir):
cache_filename = cache_dir.joinpath('retrieve_instance_pixeldata.jpg')
cache_filename = str(cache_dir.joinpath('retrieve_instance_pixeldata.jpg'))
with open(cache_filename, 'rb') as f:
content = f.read()
headers = {
Expand All @@ -447,7 +448,7 @@ def test_retrieve_instance_frames_jpeg_default_transfer_syntax(httpserver,


def test_retrieve_instance_frames_jp2(httpserver, client, cache_dir):
cache_filename = cache_dir.joinpath('retrieve_instance_pixeldata.jp2')
cache_filename = str(cache_dir.joinpath('retrieve_instance_pixeldata.jp2'))
with open(cache_filename, 'rb') as f:
content = f.read()
headers = {
Expand All @@ -474,7 +475,7 @@ def test_retrieve_instance_frames_jp2(httpserver, client, cache_dir):


def test_retrieve_instance_frames_rendered_jpeg(httpserver, client, cache_dir):
cache_filename = cache_dir.joinpath('retrieve_instance_pixeldata.jpg')
cache_filename = str(cache_dir.joinpath('retrieve_instance_pixeldata.jpg'))
with open(cache_filename, 'rb') as f:
content = f.read()
headers = {
Expand Down Expand Up @@ -520,7 +521,7 @@ def test_retrieve_instance_frames_rendered_jpeg_transfer_syntax(httpserver,


def test_retrieve_instance_frames_rendered_png(httpserver, client, cache_dir):
cache_filename = cache_dir.joinpath('retrieve_instance_pixeldata.png')
cache_filename = str(cache_dir.joinpath('retrieve_instance_pixeldata.png'))
with open(cache_filename, 'rb') as f:
content = f.read()
headers = {
Expand Down Expand Up @@ -626,7 +627,7 @@ def test_load_json_dataset_pn_vm2_empty(httpserver, client, cache_dir):


def test_load_xml_response(httpserver, client, cache_dir):
cache_filename = cache_dir.joinpath('store.xml')
cache_filename = str(cache_dir.joinpath('store.xml'))
with open(cache_filename, 'rb') as f:
tree = ET.fromstring(f.read())
dataset = _load_xml_dataset(tree)
Expand Down

0 comments on commit 35a0540

Please sign in to comment.