From patchwork Mon Feb 11 13:05:00 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: 157989 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2576112jaa; Mon, 11 Feb 2019 05:06:28 -0800 (PST) X-Google-Smtp-Source: AHgI3IblR/9sPwcAR7C2q2XdLYYYwqpp1/IokgYpOb41Hr46drdFUgoyd19JKK6QFkE7T+utPvCy X-Received: by 2002:a05:6000:1287:: with SMTP id f7mr4146083wrx.203.1549890388366; Mon, 11 Feb 2019 05:06:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549890388; cv=none; d=google.com; s=arc-20160816; b=qmCutHlAbSP2tZu6j5QGtcLUacPp3sXFIs2aydruyvusVzVlvofVHWJfh+CF6wyuFX 42NfndVbsJtgwYAPF84rB9vZ6wR9s4XUVL8Yvebn7FmmopKCf1aP61NuOj4WnSrQEmEf rhpSgpH3yq7dwPPoMMTQRYIP+5+zMnYsRebQW5S9ELbEne2d9pIcio67G6ihPCXtJGCT mEvDQ27RSvWQviyplBc8jsVA9CApXC+kfLhfPG1k/PcmGlb1TSAlSq4/ja3UJk6f7BOk Ya89fHNaAWVoZtds9Rlsj/pG55m0W3TMjNBZ0ELpq4cPmozlmNXnwSicnt/+398erLoN Cstw== 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=vqsq91uqQypy+qfBMXYCU9y7IkJi5s3myovMUvUFn7M=; b=hsQMOEIyOH5Xdg702UzS/IdWhhwV+BLmoipTqQQhGDoj8kkS6m45RESUBpGy24dWJh qnxx2F90Ac3cWXhk3A/r6WfohX3ZXJLkXd7o/k41VJQD7CqrjWboYKll4aSG2c8RVnL4 xGD3+ffi92sPkdMMCH1TgJT9JTf6/A546Qy36uGyTkkVl+cwkDR29aksFTN6G9M1Upkx lgx+rHXI/+3J2FlOwafIcO2cCdtkwIgYheYF9m9+XGiaSZ6/u3UfzfeHbhZAX1DsoOnc AkmuWhJVxMCEGhR+a4/a0QR/SxB0Ijxws1zh2/WP/Gl2W17oIDrkYWZFjUUJq4toTeKE x3og== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=E2P3vQ4G; 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 p8si7394902wrh.39.2019.02.11.05.06.28 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 11 Feb 2019 05:06:28 -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=E2P3vQ4G; 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]:49943 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBI3-0007T3-4d for patch@linaro.org; Mon, 11 Feb 2019 08:06:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBHV-0007On-Sx for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBHO-00047H-1o for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:47 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:38833) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBHI-0003qe-D1 for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:05:41 -0500 Received: by mail-wm1-x330.google.com with SMTP id v26so17165442wmh.3 for ; Mon, 11 Feb 2019 05:05:21 -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=vqsq91uqQypy+qfBMXYCU9y7IkJi5s3myovMUvUFn7M=; b=E2P3vQ4G3HSlgjdNqAHUVkPqsbVrg4/Jy35d6cCe7pcTDvfocN3iKSyh7Pm3BzChNO 2T/3WgugdkGW7BBSuxKq3l8fw3dMBX9sPD5lyF9Uk/7RH/fShdZaAWDG8dlt+c0fpro/ 7PMWTE+LWDwiLHlVy4+AUXbwRhIv9Z8Z9BTNUm6nyLalis0C/puNFQO5WThHkLmMxZ9w HTRiepleIHKcsTcggoD0SFRsgX0wTefJTGNOL78fr4R11yIv0mo+h6Q74G6EOCP+uYU2 9sbVroWYvg9/uBFE78OHdN4kLb/dEVv998zzA0YGsHxNpmWx5qtKOiNEnP3I8gbVGxKS u/EA== 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=vqsq91uqQypy+qfBMXYCU9y7IkJi5s3myovMUvUFn7M=; b=SaMYXAaYTtSv57U9zwOKEw/2Ug1oEWO+vKmZ453/1HqGCP07insZGuL12cT5FsOYNo sVeX734IV+ouWqs7RAWGTivuMyrqthAGJDpWv93fTXJ04+054KAU0abyj5OohPi3G8Zi 2ypjsv/5q5Im61PnR2bX5G8k5Mb7vuHLuc5s6CxEyW5k5KRsWmihru9W4dkFZ5HFrZrd usILfZQCoRcvSCLaxNhuQ8f3Aos5sqGP97UwpG6jwM6gU/ypC7xzxKQZZmCQ778tdXQJ LA33itLJ5tqyOlPnI+gROSwHqz0fQKoG8rFFgpHVcnlgjSlGx5EirZQVkxl3JwhsvXIg OHmg== X-Gm-Message-State: AHQUAuau5raEy6JBOrYKCXSnJ8QKqp8XybnId8hkbm+0ImiEOzX2EAxl xayknVWwdNpl7tn4nlXttk5I6w== X-Received: by 2002:a05:600c:2:: with SMTP id g2mr5733060wmc.109.1549890320481; Mon, 11 Feb 2019 05:05:20 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y145sm10389692wmd.30.2019.02.11.05.05.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:05:14 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9060E1FF8B; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:05:00 +0000 Message-Id: <20190211130507.8710-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-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::330 Subject: [Qemu-devel] [PULL 11/18] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 -- 2.20.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())