Mercurial > hg > orthanc-tests
comparison NewTests/helpers.py @ 718:e1b7654fb58d attach-custom-data tip
merged find-refactoring -> attach-custom-data
author | Alain Mazy <am@orthanc.team> |
---|---|
date | Wed, 09 Oct 2024 11:07:09 +0200 |
parents | bdb9763d53ff |
children |
comparison
equal
deleted
inserted
replaced
705:beb7bd0fdf47 | 718:e1b7654fb58d |
---|---|
194 if Helpers.is_docker(): | 194 if Helpers.is_docker(): |
195 subprocess.run(["docker", "network", "rm", network]) # ignore error | 195 subprocess.run(["docker", "network", "rm", network]) # ignore error |
196 subprocess.run(["docker", "network", "create", network]) | 196 subprocess.run(["docker", "network", "create", network]) |
197 | 197 |
198 @classmethod | 198 @classmethod |
199 def launch_orthanc_to_prepare_db(cls, config_name: str = None, config: object = None, config_path: str = None, storage_name: str = None, plugins = []): | 199 def launch_orthanc_to_prepare_db(cls, config_name: str = None, config: object = None, config_path: str = None, storage_name: str = None, plugins = [], docker_network: str = None): |
200 if config_name and storage_name and config: | 200 if config_name and storage_name and config: |
201 # generate the configuration file | 201 # generate the configuration file |
202 config_path = cls.generate_configuration( | 202 config_path = cls.generate_configuration( |
203 config_name=config_name, | 203 config_name=config_name, |
204 storage_name=storage_name, | 204 storage_name=storage_name, |
217 elif Helpers.orthanc_previous_version_docker_image: | 217 elif Helpers.orthanc_previous_version_docker_image: |
218 cls.launch_orthanc_docker( | 218 cls.launch_orthanc_docker( |
219 docker_image=Helpers.orthanc_previous_version_docker_image, | 219 docker_image=Helpers.orthanc_previous_version_docker_image, |
220 storage_name=storage_name, | 220 storage_name=storage_name, |
221 config_name=config_name, | 221 config_name=config_name, |
222 config_path=config_path | 222 config_path=config_path, |
223 network=docker_network | |
223 ) | 224 ) |
224 else: | 225 else: |
225 raise RuntimeError("Invalid configuration, can not launch Orthanc") | 226 raise RuntimeError("Invalid configuration, can not launch Orthanc") |
226 | 227 |
227 @classmethod | 228 @classmethod |