Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2025-12-20 02:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

runing as sh breaks tests, override testinfra

Browse Source
This commit is contained in:
diginc
2017-01-17 22:48:59 -06:00
parent eedea6526a
commit 73c054cbc5
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/conftest.py
View File

@@ -20,6 +20,21 @@ def DockerGeneric(request, args, image, cmd):
docker_container = testinfra.get_backend("docker://" + docker_id) docker_container = testinfra.get_backend("docker://" + docker_id)
docker_container.id = docker_id docker_container.id = docker_id
def run_bash(self, command, *args, **kwargs):
cmd = self.get_command(command, *args)
if self.user is not None:
out = self.run_local(
"docker exec -u %s %s /bin/bash -c %s",
self.user, self.name, cmd)
else:
out = self.run_local(
"docker exec %s /bin/bash -c %s", self.name, cmd)
out.command = self.encode(cmd)
return out
funcType = type(docker_container.run)
docker_container.run = funcType(run_bash, docker_container, testinfra.backend.docker.DockerBackend)
return docker_container return docker_container
@pytest.fixture @pytest.fixture