diff options
| author | Fam Zheng <famz@redhat.com> | 2017-07-12 15:55:27 +0800 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2017-07-17 11:34:20 +0800 |
| commit | 58bf7b6d8ccc469d8c001b8cf2b632d3f9e7fa38 (patch) | |
| tree | 808e3a0013428bf4b9149a2f95c07685430d8b69 /tests/docker/docker.py | |
| parent | 8a2390a4f4743f700da1d07c3bc04d6661ce1487 (diff) | |
| download | focaccia-qemu-58bf7b6d8ccc469d8c001b8cf2b632d3f9e7fa38.tar.gz focaccia-qemu-58bf7b6d8ccc469d8c001b8cf2b632d3f9e7fa38.zip | |
docker.py: Drop infile parameter
The **kwargs can do this just well. Signed-off-by: Fam Zheng <famz@redhat.com> Message-Id: <20170712075528.22770-2-famz@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'tests/docker/docker.py')
| -rwxr-xr-x | tests/docker/docker.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/docker/docker.py b/tests/docker/docker.py index e707e5bcca..f5ac86b38a 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -112,11 +112,9 @@ class Docker(object): signal.signal(signal.SIGTERM, self._kill_instances) signal.signal(signal.SIGHUP, self._kill_instances) - def _do(self, cmd, quiet=True, infile=None, **kwargs): + def _do(self, cmd, quiet=True, **kwargs): if quiet: kwargs["stdout"] = DEVNULL - if infile: - kwargs["stdin"] = infile return subprocess.call(self._command + cmd, **kwargs) def _do_kill_instances(self, only_known, only_active=True): @@ -184,7 +182,7 @@ class Docker(object): def update_image(self, tag, tarball, quiet=True): "Update a tagged image using " - self._do(["build", "-t", tag, "-"], quiet=quiet, infile=tarball) + self._do(["build", "-t", tag, "-"], quiet=quiet, stdin=tarball) def image_matches_dockerfile(self, tag, dockerfile): try: |