Commit 58bf7b6d authored by Fam Zheng's avatar Fam Zheng
Browse files

docker.py: Drop infile parameter 



The **kwargs can do this just well.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-Id: <20170712075528.22770-2-famz@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
parent 8a2390a4

tests/docker/docker.py

+2 −4
Original line number Diff line number Diff line
@@ -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: