diff --git a/tests/AutoconfTest.py b/tests/AutoconfTest.py index cd79c0333..10e4292ca 100644 --- a/tests/AutoconfTest.py +++ b/tests/AutoconfTest.py @@ -90,12 +90,9 @@ class AutoconfTest(Test) : if proc.returncode != 0 : raise(Exception("setup-autoconf failed")) if isdir(example_data) : - proc = run("sudo ls " + example_data, shell=True, capture_output=True) - for cp_dir in proc.stdout.decode().splitlines() : - if isdir(join(example_data, cp_dir)) : - if isdir(join("/tmp/bw-data", cp_dir)) : - run("sudo rm -rf " + join("/tmp/bw-data", cp_dir), shell=True) - copytree(join(example_data, cp_dir), join("/tmp/bw-data", cp_dir)) + proc = run("sudo cp -rp " + example_data + "/* /tmp/bw-data", shell=True) + if proc.returncode != 0 : + raise(Exception("cp bw-data failed")) proc = run("docker-compose -f autoconf.yml pull", shell=True, cwd=test) if proc.returncode != 0 : raise(Exception("docker-compose pull failed")) diff --git a/tests/DockerTest.py b/tests/DockerTest.py index 81921e8d1..cec9efa70 100644 --- a/tests/DockerTest.py +++ b/tests/DockerTest.py @@ -49,12 +49,9 @@ class DockerTest(Test) : if proc.returncode != 0 : raise(Exception("setup-docker failed")) if isdir(example_data) : - proc = run("sudo ls " + example_data, shell=True, capture_output=True) - for cp_dir in proc.stdout.decode().splitlines() : - if isdir(join(example_data, cp_dir)) : - if isdir(join("/tmp/bw-data", cp_dir)) : - run("sudo rm -rf " + join("/tmp/bw-data", cp_dir), shell=True) - copytree(join(example_data, cp_dir), join("/tmp/bw-data", cp_dir)) + proc = run("sudo cp -rp " + example_data + "/* /tmp/bw-data", shell=True) + if proc.returncode != 0 : + raise(Exception("cp bw-data failed")) proc = run("docker-compose pull", shell=True, cwd=test) if proc.returncode != 0 : raise(Exception("docker-compose pull failed"))