Mercurial > hg > orthanc-tests
changeset 475:fe37cf5e9c02
force docker volume rm
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Tue, 03 May 2022 15:24:16 +0200 |
| parents | 6917a26881ed |
| children | 77f868063bb3 |
| files | NewTests/helpers.py NewTests/main.py |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/NewTests/helpers.py Mon May 02 17:05:42 2022 +0200 +++ b/NewTests/helpers.py Tue May 03 15:24:16 2022 +0200 @@ -110,7 +110,7 @@ storage_path = cls.get_storage_path(storage_name=storage_name) shutil.rmtree(storage_path, ignore_errors=True) elif Helpers.is_docker(): - subprocess.run(["docker", "volume", "rm", storage_name]) + subprocess.run(["docker", "volume", "rm", "-f", storage_name]) @classmethod def launch_orthanc_to_prepare_db(cls, config_name: str = None, config: object = None, config_path: str = None, storage_name: str = None, plugins = []):
--- a/NewTests/main.py Mon May 02 17:05:42 2022 +0200 +++ b/NewTests/main.py Tue May 03 15:24:16 2022 +0200 @@ -20,7 +20,8 @@ parser = argparse.ArgumentParser(description='Executes Orthanc integration tests.') parser.add_argument('-k', '--pattern', dest='test_name_patterns', action='append', type=str, help='a test pattern (ex: Housekeeper.toto') parser.add_argument('--orthanc_under_tests_hostname', type=str, default="localhost", help="orthanc under tests hostname") - parser.add_argument('--orthanc_under_tests_http_port', type=int, default=8042, help="orthanc under tests HTTP port") + parser.add_argument('--orthanc_under_tests_http_port', type=int, default=8052, help="orthanc under tests HTTP port") + parser.add_argument('--orthanc_under_tests_dicom_port', type=int, default=4252, help="orthanc under tests DICOM port") parser.add_argument('--orthanc_under_tests_exe', type=str, default=None, help="path to the orthanc executable (if it must be launched by this script)") parser.add_argument('--orthanc_previous_version_exe', type=str, default=None, help="path to the orthanc executable used to prepare previous version of storage/db (if it must be launched by this script and if different from orthanc_under_tests_exe)") parser.add_argument('--orthanc_under_tests_docker_image', type=str, default=None, help="Docker image of the orthanc under tests (if it must be launched by this script)") @@ -37,6 +38,7 @@ Helpers.orthanc_under_tests_hostname = args.orthanc_under_tests_hostname Helpers.orthanc_under_tests_http_port = args.orthanc_under_tests_http_port + Helpers.orthanc_under_tests_dicom_port = args.orthanc_under_tests_dicom_port Helpers.plugins = args.plugins Helpers.orthanc_under_tests_exe = args.orthanc_under_tests_exe