Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-19 05:40:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

switching testinfra's Docker run from dash to bash

Browse source
This commit is contained in:
diginc 2016-11-02 23:58:54 -05:00
parent 699e299345
commit a5a067d50f
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
test/conftest.py
View file

@ -8,6 +8,20 @@ check_output = testinfra.get_backend(
@pytest.fixture
def Pihole(Docker):
''' used to contain some script stubbing, now pretty much an alias '''
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.run)
Docker.run = funcType(run_bash, Docker, testinfra.backend.docker.DockerBackend)
return Docker
@pytest.fixture