From patchwork Fri Jan 25 14:00:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 156587 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp403721jaa; Fri, 25 Jan 2019 06:10:20 -0800 (PST) X-Google-Smtp-Source: ALg8bN5C58TT70GcIsitxypPbv8Jv9seGJwH5Y6QOo6nc5Zn3C9jcPo2++sIuczOreUNtFiu6liy X-Received: by 2002:a1c:ce0e:: with SMTP id e14mr7373296wmg.53.1548425419885; Fri, 25 Jan 2019 06:10:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548425419; cv=none; d=google.com; s=arc-20160816; b=0Z91xIicYdioh4nYuwksP4FKwOajWOWIOofu3jfaMDd3o8RFi47yWYrFNYZTDngL1p MqKXfLBhP22AbIcZZ8sUMXLe8hLc2hriQWUTYqpGHXMmB3UQpd3r46yxOOM1lQuSqG41 1NYMkHZ5EHhDTUGqhi0LJfcFZlfrp8mFibHPgv7Xdd4Bqy4PbbWo7ZAJ6oncTTIlNvSd E4q7x4fX/3cMZYZChuaIDvgQAWG2jyoOO1q7WMS1ZpcUI7X1Wi8eACXcNLMktmWZyiFC c8M7Rws/1bzfhKPYeSwCkoFUh8S7m2Jb15EtP68/ov3y6W1eL/ioi5uJ2gyGzPnpWO7a pqcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=EhCwiw40QInNmMcJBp5KZYmHZQD+SvErQd8SOORs+Mg=; b=d04qNyECSx+Ix8oes3/CWN5bHnpPegiiv8dBWBZbTUxo/yFWZQfSE5t+lSOjFFfvdc PND24AviJz/5qT1AaXB3DDmCi0u2i9F41dqPNI/+KzXMF+wB+ZSSzjDY5pF0HTOSlWrL lQPZDwpvsdBxkvfddNMCL6V7XJjtjhM1RohKD8/wZs+gKZgK/y5f4IQepX7VSOd2Izow 3Ey4bskiaG60wNUIdaQRp/oxUbhuD2dETWiOElnutWiC/M9McKJyf7AOAT0ggaVWHt1I g0q+W0uGfQkslWUWQk1mkxw3SfbL76oCqvveOshO7rrYb6D30smLi18UV8WloCLUmHsP gN1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KBXSugVj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u18si75763667wro.78.2019.01.25.06.10.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 25 Jan 2019 06:10:19 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KBXSugVj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:45277 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn2BW-0002mP-NL for patch@linaro.org; Fri, 25 Jan 2019 09:10:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn22A-0003c6-6q for qemu-devel@nongnu.org; Fri, 25 Jan 2019 09:00:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gn224-0000jx-LE for qemu-devel@nongnu.org; Fri, 25 Jan 2019 09:00:37 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:38239) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gn224-0000h5-48 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 09:00:32 -0500 Received: by mail-wr1-x434.google.com with SMTP id v13so10395853wrw.5 for ; Fri, 25 Jan 2019 06:00:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EhCwiw40QInNmMcJBp5KZYmHZQD+SvErQd8SOORs+Mg=; b=KBXSugVjgTUQCEtxi1ee5++9u+d0lNTZv7IWkd2AvBCJ/wxDYQRRQtwKrGAKJmWc6H ZXz16yE5smFLlzwQ3lvVgKFtlPDM3kRaWpsrM+eHe4tjNCjunw5/Z7kVv+zz6WY6eIZz zo07kQ1T4PtkyI7unpp1Eoflp1jBZ7MIP11II= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EhCwiw40QInNmMcJBp5KZYmHZQD+SvErQd8SOORs+Mg=; b=gaIfP85dj2NNfC/EYsC+xAsspCaQFgNkBrfqNO4sByWWnb+bXnPy+Y/nSqRXAeyrvU g4yimNG8T2zrHBiLOyUTleRTXwhXC8v/VrC2eSerpS5b461Rh/LFHOzgmmVlVK0YX0K5 xvLUrMdLIXhm93REafarn9vEL+xEcSZJxUX73kcCJ2jq8/D0yHVwQxBbKpS8G6u43GL8 t40vjUhBkYRusmIlZ1ETxY7SvRoDcT9IYng0PY1nq/Rroy4RKpuAcx7BTZczg2UQb0B5 FXffI+Rtb3h1qvRajsYX2YDugddDPbbmhpvK3rcKC1GgiHSymiEGDsvm2FztlA1nCZU1 Eddg== X-Gm-Message-State: AJcUuke3zXf4xgQ4h/xMlthrgCGOgU9LXgbfvneM8QxdmgBGsYTyq1/d E8ixTtLDjmud3joaXj0IbPXqVQ== X-Received: by 2002:adf:900f:: with SMTP id h15mr11614419wrh.18.1548424829874; Fri, 25 Jan 2019 06:00:29 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y8sm55149138wmg.13.2019.01.25.06.00.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Jan 2019 06:00:24 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 56AC13E0763; Fri, 25 Jan 2019 14:00:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 14:00:12 +0000 Message-Id: <20190125140017.6092-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190125140017.6092-1-alex.bennee@linaro.org> References: <20190125140017.6092-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PATCH v1 09/14] tests: PEP8 cleanup of docker.py, mostly white space X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" My editor keeps putting squiggly lines under a bunch of the python lines to remind me how non-PEP8 compliant it is. Clean that up so it's easier to spot new errors. Signed-off-by: Alex Bennée --- tests/docker/docker.py | 48 ++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 13 deletions(-) -- 2.17.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index a74338cb61..53a8c9c801 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -30,7 +30,7 @@ except ImportError: from io import StringIO from shutil import copy, rmtree from pwd import getpwuid -from datetime import datetime,timedelta +from datetime import datetime, timedelta FILTERED_ENV_NAMES = ['ftp_proxy', 'http_proxy', 'https_proxy'] @@ -43,9 +43,11 @@ def _text_checksum(text): """Calculate a digest string unique to the text content""" return hashlib.sha1(text).hexdigest() + def _file_checksum(filename): return _text_checksum(open(filename, 'rb').read()) + def _guess_docker_command(): """ Guess a working docker command or raise exception if not found""" commands = [["docker"], ["sudo", "-n", "docker"]] @@ -59,9 +61,10 @@ def _guess_docker_command(): except OSError: pass commands_txt = "\n".join([" " + " ".join(x) for x in commands]) - raise Exception("Cannot find working docker command. Tried:\n%s" % \ + raise Exception("Cannot find working docker command. Tried:\n%s" % commands_txt) + def _copy_with_mkdir(src, root_dir, sub_path='.'): """Copy src into root_dir, creating sub_path as needed.""" dest_dir = os.path.normpath("%s/%s" % (root_dir, sub_path)) @@ -96,6 +99,7 @@ def _get_so_libs(executable): return libs + def _copy_binary_with_libs(src, bin_dest, dest_dir): """Maybe copy a binary and all its dependent libraries. @@ -117,7 +121,7 @@ def _copy_binary_with_libs(src, bin_dest, dest_dir): if libs: for l in libs: so_path = os.path.dirname(l) - _copy_with_mkdir(l , dest_dir, so_path) + _copy_with_mkdir(l, dest_dir, so_path) def _check_binfmt_misc(executable): @@ -142,7 +146,7 @@ def _check_binfmt_misc(executable): with open(binfmt_entry) as x: entry = x.read() if re.search("flags:.*F.*\n", entry): - print("binfmt_misc for %s uses persistent(F) mapping to host binary\n" % + print("binfmt_misc for %s uses persistent(F) mapping to host binary" % (binary)) return None, True @@ -164,6 +168,7 @@ def _read_qemu_dockerfile(img_name): img_name + ".docker") return open(df, "r").read() + def _dockerfile_preprocess(df): out = "" for l in df.splitlines(): @@ -181,6 +186,7 @@ def _dockerfile_preprocess(df): out += l + "\n" return out + class Docker(object): """ Running Docker commands """ def __init__(self): @@ -248,7 +254,7 @@ class Docker(object): def build_image(self, tag, docker_dir, dockerfile, quiet=True, user=False, argv=None, extra_files_cksum=[]): - if argv == None: + if argv is None: argv = [] tmp_df = tempfile.NamedTemporaryFile(dir=docker_dir, suffix=".docker") @@ -269,7 +275,7 @@ class Docker(object): tmp_df.flush() - self._do_check(["build", "-t", tag, "-f", tmp_df.name] + argv + \ + self._do_check(["build", "-t", tag, "-f", tmp_df.name] + argv + [docker_dir], quiet=quiet) @@ -299,9 +305,11 @@ class Docker(object): def command(self, cmd, argv, quiet): return self._do([cmd] + argv, quiet=quiet) + class SubCommand(object): """A SubCommand template base class""" - name = None # Subcommand name + name = None # Subcommand name + def shared_args(self, parser): parser.add_argument("--quiet", action="store_true", help="Run quietly unless an error occurred") @@ -309,6 +317,7 @@ class SubCommand(object): def args(self, parser): """Setup argument parser""" pass + def run(self, args, argv): """Run command. args: parsed argument by argument parser. @@ -316,18 +325,23 @@ class SubCommand(object): """ pass + class RunCommand(SubCommand): """Invoke docker run and take care of cleaning up""" name = "run" + def args(self, parser): parser.add_argument("--keep", action="store_true", help="Don't remove image when command completes") + def run(self, args, argv): return Docker().run(argv, args.keep, quiet=args.quiet) + class BuildCommand(SubCommand): - """ Build docker image out of a dockerfile. Arguments: """ + """ Build docker image out of a dockerfile. Arg: """ name = "build" + def args(self, parser): parser.add_argument("--include-executable", "-e", help="""Specify a binary that will be copied to the @@ -392,8 +406,8 @@ class BuildCommand(SubCommand): cksum += [(filename, _file_checksum(filename))] argv += ["--build-arg=" + k.lower() + "=" + v - for k, v in os.environ.iteritems() - if k.lower() in FILTERED_ENV_NAMES] + for k, v in os.environ.iteritems() + if k.lower() in FILTERED_ENV_NAMES] dkr.build_image(tag, docker_dir, dockerfile, quiet=args.quiet, user=args.user, argv=argv, extra_files_cksum=cksum) @@ -402,9 +416,11 @@ class BuildCommand(SubCommand): return 0 + class UpdateCommand(SubCommand): - """ Update a docker image with new executables. Arguments: """ + """ Update a docker image with new executables. Args: """ name = "update" + def args(self, parser): parser.add_argument("tag", help="Image Tag") @@ -457,16 +473,20 @@ class UpdateCommand(SubCommand): return 0 + class CleanCommand(SubCommand): """Clean up docker instances""" name = "clean" + def run(self, args, argv): Docker().clean() return 0 + class ImagesCommand(SubCommand): """Run "docker images" command""" name = "images" + def run(self, args, argv): return Docker().command("images", argv, args.quiet) @@ -539,7 +559,7 @@ class CheckCommand(SubCommand): try: dkr = Docker() - except: + except subprocess.CalledProcessError: print("Docker not set up") return 1 @@ -578,7 +598,8 @@ class CheckCommand(SubCommand): def main(): parser = argparse.ArgumentParser(description="A Docker helper", - usage="%s ..." % os.path.basename(sys.argv[0])) + usage="%s ..." % + os.path.basename(sys.argv[0])) subparsers = parser.add_subparsers(title="subcommands", help=None) for cls in SubCommand.__subclasses__(): cmd = cls() @@ -589,5 +610,6 @@ def main(): args, argv = parser.parse_known_args() return args.cmdobj.run(args, argv) + if __name__ == "__main__": sys.exit(main())