diff --git a/tests/AutoconfTest.py b/tests/AutoconfTest.py index 5649d156a..e8c6b73a8 100644 --- a/tests/AutoconfTest.py +++ b/tests/AutoconfTest.py @@ -30,9 +30,9 @@ class AutoconfTest(Test) : rmtree("/tmp/autoconf") copytree("./integrations/autoconf", "/tmp/autoconf") compose = "/tmp/autoconf/docker-compose.yml" - self._replace_in_file(compose, r"bunkerity/bunkerweb:.*$", "10.20.1.1:5000/bw-tests:latest") - self._replace_in_file(compose, r"bunkerity/bunkerweb-autoconf:.*$", "10.20.1.1:5000/bw-autoconf-tests:latest") - self._replace_in_file(compose, r"\./bw\-data:/", "/tmp/bw-data:/") + Test.replace_in_file(compose, r"bunkerity/bunkerweb:.*$", "10.20.1.1:5000/bw-tests:latest") + Test.replace_in_file(compose, r"bunkerity/bunkerweb-autoconf:.*$", "10.20.1.1:5000/bw-autoconf-tests:latest") + Test.replace_in_file(compose, r"\./bw\-data:/", "/tmp/bw-data:/") proc = run("docker-compose pull", cwd="/tmp/autoconf", shell=True) if proc.returncode != 0 : raise(Exception("docker-compose pull failed (autoconf stack)")) @@ -77,12 +77,12 @@ class AutoconfTest(Test) : test = "/tmp/tests/" + self._name compose = "/tmp/tests/" + self._name + "/service.yml" example_data = "./examples/" + self._name + "/bw-data" - self._replace_in_file(compose, r"bunkerity/bunkerweb:.*$", "10.20.1.1:5000/bw-tests:latest") - self._replace_in_file(compose, r"\./bw\-data:/", "/tmp/bw-data:/") - self._replace_in_file(compose, r"\- bw_data:/", "- /tmp/bw-data:/") + Test.replace_in_file(compose, r"bunkerity/bunkerweb:.*$", "10.20.1.1:5000/bw-tests:latest") + Test.replace_in_file(compose, r"\./bw\-data:/", "/tmp/bw-data:/") + Test.replace_in_file(compose, r"\- bw_data:/", "- /tmp/bw-data:/") for ex_domain, test_domain in self._domains.items() : - self._replace_in_files(test, ex_domain, test_domain) - self._rename(test, ex_domain, test_domain) + Test.replace_in_files(test, ex_domain, test_domain) + Test.rename(test, ex_domain, test_domain) setup = test + "/setup-autoconf.sh" if isfile(setup) : proc = run("sudo ./setup-autoconf.sh", cwd=test, shell=True) diff --git a/tests/DockerTest.py b/tests/DockerTest.py index acf62c2c0..74681ac93 100644 --- a/tests/DockerTest.py +++ b/tests/DockerTest.py @@ -36,12 +36,12 @@ class DockerTest(Test) : test = "/tmp/tests/" + self._name compose = "/tmp/tests/" + self._name + "/docker-compose.yml" example_data = "./examples/" + self._name + "/bw-data" - self._replace_in_file(compose, r"bunkerity/bunkerweb:.*$", "10.20.1.1:5000/bw-tests:latest") - self._replace_in_file(compose, r"\./bw\-data:/", "/tmp/bw-data:/") - self._replace_in_file(compose, r"\- bw_data:/", "- /tmp/bw-data:/") + Test.replace_in_file(compose, r"bunkerity/bunkerweb:.*$", "10.20.1.1:5000/bw-tests:latest") + Test.replace_in_file(compose, r"\./bw\-data:/", "/tmp/bw-data:/") + Test.replace_in_file(compose, r"\- bw_data:/", "- /tmp/bw-data:/") for ex_domain, test_domain in self._domains.items() : - self._replace_in_files(test, ex_domain, test_domain) - self._rename(test, ex_domain, test_domain) + Test.replace_in_files(test, ex_domain, test_domain) + Test.rename(test, ex_domain, test_domain) setup = test + "/setup-docker.sh" if isfile(setup) : proc = run("sudo ./setup-docker.sh", cwd=test, shell=True) diff --git a/tests/Test.py b/tests/Test.py index a9e804d9d..9b12550c1 100644 --- a/tests/Test.py +++ b/tests/Test.py @@ -109,19 +109,19 @@ class Test(ABC) : def _debug_fail(self) : pass - def _replace_in_file(self, path, old, new) : + def replace_in_file(path, old, new) : with open(path, "r") as f : content = f.read() content = sub(old, new, content, flags=MULTILINE) with open(path, "w") as f : f.write(content) - def _replace_in_files(self, path, old, new) : + def replace_in_files(path, old, new) : for root, dirs, files in walk(path) : for name in files : - self._replace_in_file(join(root, name), old, new) + Test.replace_in_file(join(root, name), old, new) - def _rename(self, path, old, new) : + def rename(path, old, new) : for root, dirs, files in walk(path) : for name in dirs + files : full_path = join(root, name)