diff --git a/clr_test/run_test_docker_containers.py b/clr_test/run_test_docker_containers.py index 1001a0c34..7c199b36e 100644 --- a/clr_test/run_test_docker_containers.py +++ b/clr_test/run_test_docker_containers.py @@ -20,10 +20,13 @@ def run_docker(folder_name: str) -> int: os.chdir("clr_test") logging.info("Removing all clr_test-db containers") - subprocess.call('docker rm -f $(docker ps --all -q --filter ancestor=clr_test-db)', shell=True) + subprocess.call('docker rm -v -f $(docker ps --all -q --filter ancestor=clr_test-db)', shell=True) logging.info("Removing all clr_test-clearing_system containers") - subprocess.call('docker rm -f $(docker ps --all -q --filter ancestor=clr_test-clearing_system)', shell=True) + subprocess.call('docker rm -v -f $(docker ps --all -q --filter ancestor=clr_test-clearing_system)', shell=True) + + logging.info("Removing all sftp containers") + subprocess.call('docker rm -f $(docker ps --all -q --filter ancestor=mirror.gcr.io/atmoz/sftp)', shell=True) logging.info("Removing all clr_test-db images") subprocess.call('docker rmi -f clr_test-db', shell=True) @@ -91,6 +94,8 @@ def apply_test_case(folder: str) -> None: remove_directory(f"{CLR_TEST_DIR}/sftp_data/out/rdc") os.mkdir(f"{CLR_TEST_DIR}/sftp_data/out/rdc") + logging.info(os.listdir(f"{CLR_TEST_DIR}/sftp_data/out/prc")) + copy_directory(f"{DATA_ROOT_DIR}/{folder}/clearing_testing_utils/", f"{CLR_TEST_DIR}/clearing-all/clearing_testing_utils/") copy_directory(f"{DATA_ROOT_DIR}/{folder}/data",