comparison NewTests/Concurrency/test_transfer.py @ 627:76c9923050b5

patch Docker env var (thx James)
author Alain Mazy <am@osimis.io>
date Wed, 21 Feb 2024 08:36:58 +0100
parents 75dbc81d0e26
children
comparison
equal deleted inserted replaced
626:9c295b8dac00 627:76c9923050b5
16 16
17 @classmethod 17 @classmethod
18 def cleanup(cls): 18 def cleanup(cls):
19 os.chdir(here) 19 os.chdir(here)
20 print("Cleaning old compose") 20 print("Cleaning old compose")
21 subprocesss_env = os.environ.copy()
22 subprocesss_env["ORTHANC_IMAGE_UNDER_TESTS"] = Helpers.orthanc_under_tests_docker_image
21 subprocess.run(["docker", "compose", "-f", "docker-compose-transfers-concurrency.yml", "down", "-v", "--remove-orphans"], 23 subprocess.run(["docker", "compose", "-f", "docker-compose-transfers-concurrency.yml", "down", "-v", "--remove-orphans"],
22 env= { 24 env=subprocesss_env, check=True)
23 "ORTHANC_IMAGE_UNDER_TESTS": Helpers.orthanc_under_tests_docker_image
24 },
25 check=True)
26 25
27 @classmethod 26 @classmethod
28 def compose_up(cls): 27 def compose_up(cls):
29 # print("Pullling containers") 28 # print("Pullling containers")
30 # subprocess.run(["docker", "compose", "-f", "docker-compose-transfers-concurrency.yml", "pull"], 29 # subprocesss_env = os.environ.copy()
31 # env= { 30 # subprocesss_env["ORTHANC_IMAGE_UNDER_TESTS"] = Helpers.orthanc_under_tests_docker_image
32 # "ORTHANC_IMAGE_UNDER_TESTS": Helpers.orthanc_under_tests_docker_image, 31 # subprocess.run(["docker", "compose", "-f", "docker-compose-transfers-concurrency.yml", "pull"],
33 # "PATH": os.environ.get('PATH') 32 # env=subprocesss_env, check=True)
34 # },
35 # check=True)
36 33
37 print("Compose up") 34 print("Compose up")
35 subprocesss_env = os.environ.copy()
36 subprocesss_env["ORTHANC_IMAGE_UNDER_TESTS"] = Helpers.orthanc_under_tests_docker_image
38 subprocess.run(["docker", "compose", "-f", "docker-compose-transfers-concurrency.yml", "up", "-d"], 37 subprocess.run(["docker", "compose", "-f", "docker-compose-transfers-concurrency.yml", "up", "-d"],
39 env= { 38 env=subprocesss_env, check=True)
40 "ORTHANC_IMAGE_UNDER_TESTS": Helpers.orthanc_under_tests_docker_image 39
41 },
42 check=True)
43 40
44 @classmethod 41 @classmethod
45 def setUpClass(cls): 42 def setUpClass(cls):
46 cls.cleanup() 43 cls.cleanup()
47 cls.compose_up() 44 cls.compose_up()