annotate Tests/Run.py @ 363:79ce0f7a9714

upgrade to year 2021
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 06 Jan 2021 17:56:54 +0100
parents bf8369ea3ff1
children a4b8450a1158
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 #!/usr/bin/python
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 # Orthanc - A Lightweight, RESTful DICOM Store
73
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 44
diff changeset
4 # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 # Department, University Hospital of Liege, Belgium
363
79ce0f7a9714 upgrade to year 2021
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 342
diff changeset
6 # Copyright (C) 2017-2021 Osimis S.A., Belgium
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 #
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 # This program is free software: you can redistribute it and/or
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 # modify it under the terms of the GNU General Public License as
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 # published by the Free Software Foundation, either version 3 of the
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 # License, or (at your option) any later version.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 #
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 # This program is distributed in the hope that it will be useful, but
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 # WITHOUT ANY WARRANTY; without even the implied warranty of
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 # General Public License for more details.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 #
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 # You should have received a copy of the GNU General Public License
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 # along with this program. If not, see <http://www.gnu.org/licenses/>.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 import re
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 import sys
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 import argparse
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 import subprocess
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 import unittest
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2
diff changeset
27 import pprint
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28
2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1
diff changeset
29 from Tests import *
44
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 35
diff changeset
30 import Toolbox
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 ##
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 ## Parse the command-line arguments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 ##
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 parser = argparse.ArgumentParser(description = 'Run the integration tests on some instance of Orthanc.')
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 parser.add_argument('--server',
8
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
39 default = 'localhost',
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 help = 'Address of the Orthanc server to test')
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 parser.add_argument('--aet',
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 default = 'ORTHANC',
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 help = 'AET of the Orthanc instance to test')
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 parser.add_argument('--dicom',
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 type = int,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 default = 4242,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 help = 'DICOM port of the Orthanc instance to test')
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 parser.add_argument('--rest',
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 type = int,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 default = 8042,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 help = 'Port to the REST API')
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 parser.add_argument('--username',
2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1
diff changeset
53 default = 'alice',
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 help = 'Username to the REST API')
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 parser.add_argument('--password',
2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1
diff changeset
56 default = 'orthanctest',
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 help = 'Password to the REST API')
2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1
diff changeset
58 parser.add_argument('--force', help = 'Do not warn the user',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1
diff changeset
59 action = 'store_true')
8
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
60 parser.add_argument('--docker', help = 'These tests are run from Docker',
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
61 action = 'store_true')
342
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
62 parser.add_argument('--orthanc',
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
63 default = 'Orthanc',
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
64 help = 'Path to the executable of Orthanc')
6
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
65 parser.add_argument('options', metavar = 'N', nargs = '*',
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
66 help='Arguments to Python unittest')
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 args = parser.parse_args()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 if not args.force:
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 print("""
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 WARNING: This test will remove all the content of your
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 Orthanc instance running on %s!
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 Are you sure ["yes" to go on]?""" % args.server)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 if sys.stdin.readline().strip() != 'yes':
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 print('Aborting...')
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 exit(0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 ##
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 ## Generate the configuration file for the anciliary instance of
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 ## Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 ##
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
88 CONFIG = '/tmp/IntegrationTestsConfiguration.json'
342
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
89 subprocess.check_call([ Toolbox.FindExecutable(args.orthanc),
44
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 35
diff changeset
90 '--config=%s' % CONFIG ])
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91
8
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
92 with open(CONFIG, 'rt') as f:
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 config = f.read()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94
30
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 29
diff changeset
95 if args.docker and args.server == 'localhost':
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 29
diff changeset
96 args.server = GetDockerHostAddress()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 29
diff changeset
97
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 config = re.sub(r'("StorageDirectory"\s*:)\s*".*?"', r'\1 "/tmp/OrthancStorage"', config)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 config = re.sub(r'("IndexDirectory"\s*:)\s*".*?"', r'\1 "/tmp/OrthancStorage"', config)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 config = re.sub(r'("DicomAet"\s*:)\s*".*?"', r'\1 "ORTHANCTEST"', config)
8
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
101 config = re.sub(r'("DicomPort"\s*:)\s*.*?,', r'\1 5001,', config)
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
102 config = re.sub(r'("HttpPort"\s*:)\s*.*?,', r'\1 5000,', config)
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 config = re.sub(r'("RemoteAccessAllowed"\s*:)\s*false', r'\1 true', config)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 config = re.sub(r'("AuthenticationEnabled"\s*:)\s*false', r'\1 true', config)
35
f2dcf96fec51 parameter
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 30
diff changeset
105 config = re.sub(r'("HttpCompressionEnabled"\s*:)\s*true', r'\1 false', config)
8
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
106 config = re.sub(r'("RegisteredUsers"\s*:)\s*{', r'\1 { "alice" : "orthanctest"', config)
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
107 config = re.sub(r'("DicomAssociationCloseDelay"\s*:)\s*[0-9]*', r'\1 0', config)
107
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 100
diff changeset
108 config = re.sub(r'("DicomModalities"\s*:)\s*{', r'\1 { "orthanc" : [ "%s", "%s", %s ]' %
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 (args.aet, args.server, args.dicom), config)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110
289
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
111 # New to test transcoding over DICOM (1.7.0)
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
112 config = re.sub(r'("RleTransferSyntaxAccepted"\s*:)\s*true', r'\1 false', config)
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
113
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
114
8
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
115 with open(CONFIG, 'wt') as f:
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
116 f.write(config)
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
117
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 localOrthanc = ExternalCommandThread([
342
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
119 Toolbox.FindExecutable(args.orthanc),
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
120 CONFIG,
294
192665e6113f instruction to run on Windows (with WSL)
Alain Mazy <alain@mazy.be>
parents: 289
diff changeset
121 #'--verbose',
192665e6113f instruction to run on Windows (with WSL)
Alain Mazy <alain@mazy.be>
parents: 289
diff changeset
122 #'--no-jobs'
27
cde1691838d3 wildcard test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
123 #'/home/jodogne/Subversion/Orthanc/i/Orthanc', CONFIG, '--verbose'
cde1691838d3 wildcard test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
124 ])
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126
8
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
127 LOCAL = DefineOrthanc(aet = 'ORTHANCTEST',
30
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 29
diff changeset
128 server = 'localhost',
8
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
129 dicomPort = 5001,
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
130 restPort = 5000,
8
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
131 username = 'alice',
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
132 password = 'orthanctest')
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
133
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
134 REMOTE = DefineOrthanc(server = args.server,
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 username = args.username,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 password = args.password,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 aet = args.aet,
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
138 dicomPort = args.dicom,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
139 restPort = args.rest)
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142
8
f8d781d1d267 test_changes, test_archive, test_media_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 6
diff changeset
143 print('Parameters of the instance of Orthanc being tested:')
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2
diff changeset
144 pprint.pprint(REMOTE)
2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1
diff changeset
145 print('')
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147
2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1
diff changeset
148 print('Waiting for the internal Orthanc to start...')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1
diff changeset
149 while True:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1
diff changeset
150 try:
44
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 35
diff changeset
151 Toolbox.DoGet(LOCAL, '/instances')
2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1
diff changeset
152 break
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1
diff changeset
153 except:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1
diff changeset
154 time.sleep(0.1)
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 try:
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2
diff changeset
158 print('\nStarting the tests...')
306
da2be3ff2db5 fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 294
diff changeset
159 SetOrthancParameters(LOCAL, REMOTE, args.docker)
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
160
6
6d645b3011e1 test_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 5
diff changeset
161 unittest.main(argv = [ sys.argv[0] ] + args.options)
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162
83
3f2170efa8d2 patches for python3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 73
diff changeset
163
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164 finally:
3
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2
diff changeset
165 print('\nDone')
2dbba2e6aa4b reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2
diff changeset
166
1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167 # The tests have stopped or "Ctrl-C" has been hit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 try:
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169 localOrthanc.stop()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170 except:
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171 pass