annotate Tests/Toolbox.py @ 449:06eea14c5906 Orthanc-1.10.0

upgrade year to 2022
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 22 Feb 2022 11:45:59 +0100
parents e769bcf2b94f
children 933fe1bbce4f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 #!/usr/bin/python
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
3 # Orthanc - A Lightweight, RESTful DICOM Store
73
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 59
diff changeset
4 # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
5 # Department, University Hospital of Liege, Belgium
449
06eea14c5906 upgrade year to 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 437
diff changeset
6 # Copyright (C) 2017-2022 Osimis S.A., Belgium
06eea14c5906 upgrade year to 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 437
diff changeset
7 # Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
8 #
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
9 # This program is free software: you can redistribute it and/or
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
10 # modify it under the terms of the GNU General Public License as
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
11 # published by the Free Software Foundation, either version 3 of the
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
12 # License, or (at your option) any later version.
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
13 #
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
14 # This program is distributed in the hope that it will be useful, but
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
15 # WITHOUT ANY WARRANTY; without even the implied warranty of
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
16 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
17 # General Public License for more details.
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
18 #
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
19 # You should have received a copy of the GNU General Public License
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
20 # along with this program. If not, see <http://www.gnu.org/licenses/>.
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 import hashlib
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 import httplib2
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 import json
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
26 import os
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
27 import re
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
28 import signal
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
29 import subprocess
291
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
30 import tempfile
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
31 import threading
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
32 import sys
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 import time
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
34 import zipfile
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
337
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
36 from xml.dom import minidom
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
37
304
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
38 from PIL import Image, ImageChops
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
39 import math
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
40 import operator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
41
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
42
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
43 if (sys.version_info >= (3, 0)):
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
44 from urllib.parse import urlencode
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
45 from io import StringIO
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
46 from io import BytesIO
341
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
47 from urllib.parse import unquote
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
48
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
49 else:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
50 from urllib import urlencode
341
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
51 from urlparse import unquote
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
52
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
53 # http://stackoverflow.com/a/1313868/881731
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
54 try:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
55 from cStringIO import StringIO
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
56 except:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
57 from StringIO import StringIO
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1
diff changeset
58
341
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
59
398
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 391
diff changeset
60 def DecodeJson(s):
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
61 t = s
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
62
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
63 if (sys.version_info >= (3, 0)):
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
64 try:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
65 t = s.decode()
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
66 except:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
67 pass
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
68
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
69 try:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
70 return json.loads(t)
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
71 except:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
72 return t
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
75 def DefineOrthanc(server = 'localhost',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
76 restPort = 8042,
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
77 username = None,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
78 password = None,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
79 aet = 'ORTHANC',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
80 dicomPort = 4242):
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
81 #m = re.match(r'(http|https)://([^:]+):([^@]+)@([^@]+)', url)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
82 #if m != None:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
83 # url = m.groups()[0] + '://' + m.groups()[3]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
84 # username = m.groups()[1]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
85 # password = m.groups()[2]
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
87 #if not url.endswith('/'):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
88 # url += '/'
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
90 return {
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
91 'Server' : server,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
92 'Url' : 'http://%s:%d/' % (server, restPort),
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
93 'Username' : username,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
94 'Password' : password,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
95 'DicomAet' : aet,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
96 'DicomPort' : dicomPort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
97 }
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 def _SetupCredentials(orthanc, http):
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
101 if (orthanc['Username'] != None and
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
102 orthanc['Password'] != None):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
103 http.add_credentials(orthanc['Username'], orthanc['Password'])
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104
28
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
105 def DoGetRaw(orthanc, uri, data = {}, body = None, headers = {}):
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 d = ''
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 if len(data.keys()) > 0:
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 d = '?' + urlencode(data)
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 http = httplib2.Http()
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
111 http.follow_redirects = False
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 _SetupCredentials(orthanc, http)
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
114 resp, content = http.request(orthanc['Url'] + uri + d, 'GET', body = body,
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 headers = headers)
28
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
116 return (resp, content)
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
117
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
118
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
119 def DoGet(orthanc, uri, data = {}, body = None, headers = {}):
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
120 (resp, content) = DoGetRaw(orthanc, uri, data = data, body = body, headers = headers)
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
121
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 if not (resp.status in [ 200 ]):
239
8980bd19e31d dicomweb: test_allowed_methods
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 222
diff changeset
123 raise Exception(resp.status, resp)
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 else:
398
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 391
diff changeset
125 return DecodeJson(content)
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127 def _DoPutOrPost(orthanc, uri, method, data, contentType, headers):
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 http = httplib2.Http()
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
129 http.follow_redirects = False
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 _SetupCredentials(orthanc, http)
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
132 if isinstance(data, (str, bytearray, bytes)):
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 body = data
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 if len(contentType) != 0:
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 headers['content-type'] = contentType
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 else:
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 body = json.dumps(data)
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 headers['content-type'] = 'application/json'
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140 headers['expect'] = ''
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
142 resp, content = http.request(orthanc['Url'] + uri, method,
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 body = body,
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 headers = headers)
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
145 return (resp, content)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
146
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
147 def DoDeleteRaw(orthanc, uri, headers = {}):
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
148 http = httplib2.Http()
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
149 http.follow_redirects = False
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
150 _SetupCredentials(orthanc, http)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
151
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
152 resp, content = http.request(orthanc['Url'] + uri, 'DELETE', headers = headers)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
153 return (resp, content)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
154
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
155 def DoDelete(orthanc, uri, headers = {}):
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
156 (resp, content) = DoDeleteRaw(orthanc, uri, headers)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
157 if not (resp.status in [ 200 ]):
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
158 raise Exception(resp.status, resp)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
159 else:
398
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 391
diff changeset
160 return DecodeJson(content)
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
161
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
162 def DoPutRaw(orthanc, uri, data = {}, contentType = '', headers = {}):
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
163 return _DoPutOrPost(orthanc, uri, 'PUT', data, contentType, headers)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
164
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
165 def DoPut(orthanc, uri, data = {}, contentType = '', headers = {}):
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
166 (resp, content) = DoPutRaw(orthanc, uri, data, contentType, headers)
342
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
167 if not (resp.status in [ 200, 201, 302 ]):
239
8980bd19e31d dicomweb: test_allowed_methods
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 222
diff changeset
168 raise Exception(resp.status, resp)
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169 else:
398
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 391
diff changeset
170 return DecodeJson(content)
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
172 def DoPostRaw(orthanc, uri, data = {}, contentType = '', headers = {}):
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
173 return _DoPutOrPost(orthanc, uri, 'POST', data, contentType, headers)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
174
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
175 def DoPost(orthanc, uri, data = {}, contentType = '', headers = {}):
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
176 (resp, content) = DoPostRaw(orthanc, uri, data, contentType, headers)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
177 if not (resp.status in [ 200, 201, 302 ]):
239
8980bd19e31d dicomweb: test_allowed_methods
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 222
diff changeset
178 raise Exception(resp.status, resp)
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179 else:
398
9528e2a03d3c adapt DICOMweb tests following fix of issue 196 (STOW-RS: Should return 200 only when successfully stored all instances)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 391
diff changeset
180 return DecodeJson(content)
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
182 def GetDatabasePath(filename):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
183 return os.path.join(os.path.dirname(__file__), '..', 'Database', filename)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
184
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 def UploadInstance(orthanc, filename):
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
186 with open(GetDatabasePath(filename), 'rb') as f:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
187 d = f.read()
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
188
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 return DoPost(orthanc, '/instances', d, 'application/dicom')
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 def UploadFolder(orthanc, path):
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
192 for i in os.listdir(GetDatabasePath(path)):
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
193 try:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
194 UploadInstance(orthanc, os.path.join(path, i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
195 except:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
196 pass
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 def DropOrthanc(orthanc):
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 # Reset the Lua callbacks
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 DoPost(orthanc, '/tools/execute-script', 'function OnStoredInstance(instanceId, tags, metadata) end', 'application/lua')
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 DoDelete(orthanc, '/exports')
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204 for s in DoGet(orthanc, '/patients'):
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
205 DoDelete(orthanc, '/patients/%s' % s)
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
207 def InstallLuaScriptFromPath(orthanc, path):
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
208 with open(GetDatabasePath(path), 'r') as f:
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
209 InstallLuaScript(orthanc, f.read())
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
210
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
211 def InstallLuaScript(orthanc, script):
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
212 DoPost(orthanc, '/tools/execute-script', script, 'application/lua')
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
213
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
214 def UninstallLuaCallbacks(orthanc):
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
215 DoPost(orthanc, '/tools/execute-script', 'function OnStoredInstance() end', 'application/lua')
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
216 InstallLuaScriptFromPath(orthanc, 'Lua/TransferSyntaxEnable.lua')
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
217
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
218
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
219 def ComputeMD5(data):
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
220 m = hashlib.md5()
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
221 m.update(data)
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
222 return m.hexdigest()
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
223
249
24e5c8ca9440 DICOMweb: test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 239
diff changeset
224 def UncompressImage(data):
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
225 if (sys.version_info >= (3, 0)):
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
226 return Image.open(BytesIO(data))
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
227 else:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
228 return Image.open(StringIO(data))
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
229
249
24e5c8ca9440 DICOMweb: test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 239
diff changeset
230 def GetImage(orthanc, uri, headers = {}):
24e5c8ca9440 DICOMweb: test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 239
diff changeset
231 # http://www.pythonware.com/library/pil/handbook/introduction.htm
24e5c8ca9440 DICOMweb: test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 239
diff changeset
232 return UncompressImage(DoGet(orthanc, uri, headers = headers))
24e5c8ca9440 DICOMweb: test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 239
diff changeset
233
404
931be0125954 Tests/CheckZipStreams.py
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
234 def ParseArchive(s):
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
235 # http://stackoverflow.com/a/1313868/881731
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
236 if (sys.version_info >= (3, 0)):
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
237 return zipfile.ZipFile(BytesIO(s), "r")
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
238 else:
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
239 return zipfile.ZipFile(StringIO(s), "r")
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
240
404
931be0125954 Tests/CheckZipStreams.py
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
241 def GetArchive(orthanc, uri):
931be0125954 Tests/CheckZipStreams.py
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
242 return ParseArchive(DoGet(orthanc, uri))
931be0125954 Tests/CheckZipStreams.py
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
243
192
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
244 def PostArchive(orthanc, uri, body):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
245 # http://stackoverflow.com/a/1313868/881731
404
931be0125954 Tests/CheckZipStreams.py
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 398
diff changeset
246 return ParseArchive(DoPost(orthanc, uri, body))
192
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
247
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
248 def IsDefinedInLua(orthanc, name):
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
249 s = DoPost(orthanc, '/tools/execute-script', 'print(type(%s))' % name, 'application/lua')
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
250 return (s.strip() != 'nil')
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
251
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
252 def WaitEmpty(orthanc):
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
253 while True:
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
254 if len(DoGet(orthanc, '/instances')) == 0:
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
255 return
342
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
256 time.sleep(0.01)
0
cc43b57242a4 toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
257
137
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
258 def WaitJobDone(orthanc, job):
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
259 while True:
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
260 s = DoGet(orthanc, '/jobs/%s' % job) ['State']
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
261
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
262 if s == 'Success':
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
263 return True
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
264 elif s == 'Failure':
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
265 return False
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
266
342
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
267 time.sleep(0.01)
137
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
268
138
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
269 def MonitorJob(orthanc, func): # "func" is a lambda
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
270 a = set(DoGet(orthanc, '/jobs'))
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
271 func()
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
272 b = set(DoGet(orthanc, '/jobs'))
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
273
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
274 diff = list(b - a)
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
275 if len(diff) != 1:
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
276 print('No job was created!')
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
277 return False
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
278 else:
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
279 return WaitJobDone(orthanc, diff[0])
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
280
179
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
281 def MonitorJob2(orthanc, func): # "func" is a lambda
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
282 a = set(DoGet(orthanc, '/jobs'))
181
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
283 job = func()
179
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
284 b = set(DoGet(orthanc, '/jobs'))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
285
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
286 diff = list(b - a)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
287 if len(diff) != 1:
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
288 print('No job was created!')
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
289 return None
181
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
290 elif (not 'ID' in job or
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
291 diff[0] != job['ID']):
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
292 print('Mismatch in the job ID')
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
293 return None
179
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
294 elif WaitJobDone(orthanc, diff[0]):
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
295 return diff[0]
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
296 else:
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
297 print('Error while executing the job')
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
298 return None
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 174
diff changeset
299
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
300 def WaitAllNewJobsDone(orthanc, func): # "func" is a lambda
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
301 a = set(DoGet(orthanc, '/jobs'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
302 func()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
303
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
304 first = True
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
305
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
306 while True:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
307 b = set(DoGet(orthanc, '/jobs'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
308
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
309 diff = list(b - a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
310 if len(diff) == 0:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
311 if first:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
312 raise Exception('No job was created')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
313 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
314 return # We're done
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
315 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
316 first = False
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
317
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
318 if WaitJobDone(orthanc, diff[0]):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
319 a.add(diff[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
320 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
321 raise Exception('Error while executing the job')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
322
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
323
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
324 def GetDockerHostAddress():
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
325 route = subprocess.check_output([ '/sbin/ip', 'route' ])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
326 m = re.search(r'default via ([0-9.]+)', route)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
327 if m == None:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
328 return 'localhost'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
329 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
330 return m.groups()[0]
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
331
44
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
332 def FindExecutable(name):
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
333 p = os.path.join('/usr/local/bin', name)
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
334 if os.path.isfile(p):
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
335 return p
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
336
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
337 p = os.path.join('/usr/local/sbin', name)
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
338 if os.path.isfile(p):
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
339 return p
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
340
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
341 return name
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
342
173
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
343 def IsOrthancVersionAbove(orthanc, major, minor, revision):
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
344 v = DoGet(orthanc, '/system')['Version']
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
345
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
346 if v == 'mainline':
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
347 return True
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
348 else:
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
349 tmp = v.split('.')
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
350 a = int(tmp[0])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
351 b = int(tmp[1])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
352 c = int(tmp[2])
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
353 return (a > major or
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
354 (a == major and b > minor) or
ed3db6386587 testing overwrite
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
355 (a == major and b == minor and c >= revision))
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
356
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
357
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
358 class ExternalCommandThread:
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
359 @staticmethod
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
360 def ExternalCommandFunction(arg, stop_event, command, env):
318
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
361 with open(os.devnull, 'w') as devnull:
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
362 external = subprocess.Popen(command, env = env, stderr = devnull)
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
363
318
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
364 while (not stop_event.is_set()):
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
365 error = external.poll()
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
366 if error != None:
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
367 # http://stackoverflow.com/a/1489838/881731
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
368 os._exit(-1)
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
369 stop_event.wait(0.1)
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
370
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
371 print('Stopping the external command')
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
372 external.terminate()
9
3670535fbd4b fix external thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
373 external.communicate() # Wait for the command to stop
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
374
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
375 def __init__(self, command, env = None):
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
376 self.thread_stop = threading.Event()
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
377 self.thread = threading.Thread(target = self.ExternalCommandFunction,
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
378 args = (10, self.thread_stop, command, env))
9
3670535fbd4b fix external thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
379 #self.daemon = True
4
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
380 self.thread.start()
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
381
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
382 def stop(self):
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
383 self.thread_stop.set()
292a46fe374c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3
diff changeset
384 self.thread.join()
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
385
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
386
222
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 220
diff changeset
387 def AssertAlmostEqualRecursive(self, a, b, places = 7, ignoreKeys = []):
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
388 if type(a) is dict:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
389 self.assertTrue(type(b) is dict)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
390 self.assertEqual(a.keys(), b.keys())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
391 for key, value in a.items():
222
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 220
diff changeset
392 if not key in ignoreKeys:
0f03ee6ffa80 DICOMweb: test_wado_hierarchy, test_wado_bulk, test_bitbucket_issue_112
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 220
diff changeset
393 AssertAlmostEqualRecursive(self, a[key], b[key], places)
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
394
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
395 elif type(a) is list:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
396 self.assertTrue(type(b) is list)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
397 self.assertEqual(len(a), len(b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
398 for i in range(len(a)):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
399 AssertAlmostEqualRecursive(self, a[i], b[i], places)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
400
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
401 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
402 self.assertAlmostEqual(a, b, places = places)
291
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
403
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
404
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
405 def GetTransferSyntax(dicom):
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
406 with tempfile.NamedTemporaryFile(delete = True) as f:
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
407 f.write(dicom)
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
408 f.flush()
318
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
409
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
410 with open(os.devnull, 'w') as devnull:
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
411 data = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ],
bac7cc80f240 dicomweb: test_wado_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
412 stderr = devnull)
291
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
413
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
414 return re.search('<data-set xfer="(.*?)"', data).group(1)
304
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
415
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
416
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
417 def HasGdcmPlugin(orthanc):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
418 plugins = DoGet(orthanc, '/plugins')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
419 return ('gdcm' in plugins)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
420
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
421
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
422 def _GetMaxImageDifference(im1, im2):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
423 h = ImageChops.difference(im1, im2).histogram()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
424
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
425 if len(h) < 256:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
426 raise Exception()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
427
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
428 i = len(h) - 1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
429 while h[i] == 0:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
430 i -= 1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
431
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
432 return i
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
433
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
434
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
435 def GetMaxImageDifference(im1, im2):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
436 if im1.mode != im2.mode:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
437 raise Exception('Incompatible image modes')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
438
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
439 if im1.mode == 'RGB':
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
440 red1, green1, blue1 = im1.split()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
441 red2, green2, blue2 = im2.split()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
442 return max([ _GetMaxImageDifference(red1, red2),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
443 _GetMaxImageDifference(green1, green2),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
444 _GetMaxImageDifference(blue1, blue2) ])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
445 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
446 return _GetMaxImageDifference(im1, im2)
337
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
447
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
448
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
449 def DoPropFind(orthanc, uri, depth):
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
450 http = httplib2.Http()
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
451 http.follow_redirects = False
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
452 _SetupCredentials(orthanc, http)
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
453
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
454 resp, content = http.request(orthanc['Url'] + uri, 'PROPFIND', headers = { 'Depth' : str(depth) })
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
455
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
456 if not (resp.status in [ 207 ]):
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
457 raise Exception(resp.status, resp)
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
458 else:
341
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
459 xml = minidom.parseString(content)
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
460
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
461 if (xml.documentElement.nodeName != 'D:multistatus' or
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
462 xml.documentElement.attributes['xmlns:D'].value != 'DAV:'):
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
463 raise Exception()
337
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
464
341
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
465 result = {}
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
466
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
467 for i in xml.documentElement.childNodes:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
468 if i.nodeType == minidom.Node.ELEMENT_NODE:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
469 if i.nodeName != 'D:response':
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
470 raise Exception()
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
471 href = None
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
472 prop = None
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
473 for j in i.childNodes:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
474 if j.nodeType == minidom.Node.ELEMENT_NODE:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
475 if j.nodeName == 'D:href':
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
476 if href == None:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
477 href = unquote(j.firstChild.nodeValue)
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
478 else:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
479 raise Exception()
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
480 elif j.nodeName == 'D:propstat':
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
481 for k in j.childNodes:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
482 if k.nodeName == 'D:status':
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
483 if k.firstChild.nodeValue != 'HTTP/1.1 200 OK':
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
484 raise Exception()
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
485 elif k.nodeType == minidom.Node.ELEMENT_NODE:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
486 if (k.nodeName != 'D:prop' or
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
487 prop != None):
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
488 raise Exception()
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
489 prop = k
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
490 else:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
491 raise Exception()
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
492 if href == None or prop == None:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
493 raise Exception()
342
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
494
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
495 info = {}
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
496
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
497 for j in prop.childNodes:
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
498 if j.nodeType == minidom.Node.ELEMENT_NODE:
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
499 if j.nodeName == 'D:displayname':
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
500 info['displayname'] = j.firstChild.nodeValue if j.firstChild != None else ''
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
501 elif j.nodeName == 'D:creationdate':
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
502 info['creationdate'] = j.firstChild.nodeValue
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
503 elif j.nodeName == 'D:getlastmodified':
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
504 info['lastmodified'] = j.firstChild.nodeValue
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
505 elif j.nodeName == 'D:resourcetype':
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
506 k = j.getElementsByTagName('D:collection')
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
507 info['folder'] = (len(k) == 1)
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
508
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
509 result[href] = info
341
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
510 elif i.nodeType != minidom.Node.TEXT_NODE:
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
511 raise Exception()
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
512
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
513 return result