Commit 0b95ff72 authored by Fam Zheng's avatar Fam Zheng
Browse files

docker.py: Improve subprocess exit code handling 



A few error handlings are missing because we ignore the subprocess exit
code, for example "docker build" errors are currently ignored.

Introduce _do_check() aside the existing _do() method and use it in a
few places.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-Id: <20170712075528.22770-3-famz@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
parent 58bf7b6d

tests/docker/docker.py

+12 −7
Original line number Diff line number Diff line
@@ -117,6 +117,11 @@ class Docker(object): 
            kwargs["stdout"] = DEVNULL

        return subprocess.call(self._command + cmd, **kwargs)



    def _do_check(self, cmd, quiet=True, **kwargs):

        if quiet:

            kwargs["stdout"] = DEVNULL

        return subprocess.check_call(self._command + cmd, **kwargs)



    def _do_kill_instances(self, only_known, only_active=True):

        cmd = ["ps", "-q"]

        if not only_active:
@@ -175,14 +180,14 @@ class Docker(object): 
                                    extra_files_cksum)))

        tmp_df.flush()



        self._do(["build", "-t", tag, "-f", tmp_df.name] + argv + \

        self._do_check(["build", "-t", tag, "-f", tmp_df.name] + argv + \

                       [docker_dir],

                       quiet=quiet)



    def update_image(self, tag, tarball, quiet=True):

        "Update a tagged image using "



        self._do(["build", "-t", tag, "-"], quiet=quiet, stdin=tarball)

        self._do_check(["build", "-t", tag, "-"], quiet=quiet, stdin=tarball)



    def image_matches_dockerfile(self, tag, dockerfile):

        try:
@@ -195,7 +200,7 @@ class Docker(object): 
        label = uuid.uuid1().hex

        if not keep:

            self._instances.append(label)

        ret = self._do(["run", "--label",

        ret = self._do_check(["run", "--label",

                             "com.qemu.instance.uuid=" + label] + cmd,

                             quiet=quiet)

        if not keep: