annotate Tests/Run.py @ 687:edf6ce075823

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