Mercurial > hg > orthanc-tests
diff Tests/Toolbox.py @ 398:9528e2a03d3c
adapt DICOMweb tests following fix of issue #196 (STOW-RS: Should return 200 only when successfully stored all instances)
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 05 May 2021 18:59:08 +0200 |
| parents | 227d9a932467 |
| children | 931be0125954 |
line wrap: on
line diff
--- a/Tests/Toolbox.py Mon Apr 26 15:22:59 2021 +0200 +++ b/Tests/Toolbox.py Wed May 05 18:59:08 2021 +0200 @@ -56,7 +56,7 @@ from StringIO import StringIO -def _DecodeJson(s): +def DecodeJson(s): t = s if (sys.version_info >= (3, 0)): @@ -121,7 +121,7 @@ if not (resp.status in [ 200 ]): raise Exception(resp.status, resp) else: - return _DecodeJson(content) + return DecodeJson(content) def _DoPutOrPost(orthanc, uri, method, data, contentType, headers): http = httplib2.Http() @@ -156,7 +156,7 @@ if not (resp.status in [ 200 ]): raise Exception(resp.status, resp) else: - return _DecodeJson(content) + return DecodeJson(content) def DoPutRaw(orthanc, uri, data = {}, contentType = '', headers = {}): return _DoPutOrPost(orthanc, uri, 'PUT', data, contentType, headers) @@ -166,7 +166,7 @@ if not (resp.status in [ 200, 201, 302 ]): raise Exception(resp.status, resp) else: - return _DecodeJson(content) + return DecodeJson(content) def DoPostRaw(orthanc, uri, data = {}, contentType = '', headers = {}): return _DoPutOrPost(orthanc, uri, 'POST', data, contentType, headers) @@ -176,7 +176,7 @@ if not (resp.status in [ 200, 201, 302 ]): raise Exception(resp.status, resp) else: - return _DecodeJson(content) + return DecodeJson(content) def GetDatabasePath(filename): return os.path.join(os.path.dirname(__file__), '..', 'Database', filename)