# HG changeset patch # User Alain Mazy # Date 1708501018 -3600 # Node ID 76c9923050b5ce0e708375601ad8f08dcb2be80b # Parent 9c295b8dac00d4100021986949fa8f674464ed3e patch Docker env var (thx James) diff -r 9c295b8dac00 -r 76c9923050b5 NewTests/Concurrency/test_transfer.py --- a/NewTests/Concurrency/test_transfer.py Tue Feb 20 10:16:03 2024 +0100 +++ b/NewTests/Concurrency/test_transfer.py Wed Feb 21 08:36:58 2024 +0100 @@ -18,28 +18,25 @@ def cleanup(cls): os.chdir(here) print("Cleaning old compose") + subprocesss_env = os.environ.copy() + subprocesss_env["ORTHANC_IMAGE_UNDER_TESTS"] = Helpers.orthanc_under_tests_docker_image subprocess.run(["docker", "compose", "-f", "docker-compose-transfers-concurrency.yml", "down", "-v", "--remove-orphans"], - env= { - "ORTHANC_IMAGE_UNDER_TESTS": Helpers.orthanc_under_tests_docker_image - }, - check=True) + env=subprocesss_env, check=True) @classmethod def compose_up(cls): # print("Pullling containers") - # subprocess.run(["docker", "compose", "-f", "docker-compose-transfers-concurrency.yml", "pull"], - # env= { - # "ORTHANC_IMAGE_UNDER_TESTS": Helpers.orthanc_under_tests_docker_image, - # "PATH": os.environ.get('PATH') - # }, - # check=True) + # subprocesss_env = os.environ.copy() + # subprocesss_env["ORTHANC_IMAGE_UNDER_TESTS"] = Helpers.orthanc_under_tests_docker_image + # subprocess.run(["docker", "compose", "-f", "docker-compose-transfers-concurrency.yml", "pull"], + # env=subprocesss_env, check=True) print("Compose up") + subprocesss_env = os.environ.copy() + subprocesss_env["ORTHANC_IMAGE_UNDER_TESTS"] = Helpers.orthanc_under_tests_docker_image subprocess.run(["docker", "compose", "-f", "docker-compose-transfers-concurrency.yml", "up", "-d"], - env= { - "ORTHANC_IMAGE_UNDER_TESTS": Helpers.orthanc_under_tests_docker_image - }, - check=True) + env=subprocesss_env, check=True) + @classmethod def setUpClass(cls):