From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7185877375684444160 X-Received: by 2002:a05:600c:92a:b0:3cf:7217:d5fa with SMTP id m42-20020a05600c092a00b003cf7217d5famr3381531wmp.191.1673107896383; Sat, 07 Jan 2023 08:11:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4aaf:b0:3d1:be63:3b63 with SMTP id b47-20020a05600c4aaf00b003d1be633b63ls2616201wmp.1.-pod-canary-gmail; Sat, 07 Jan 2023 08:11:35 -0800 (PST) X-Google-Smtp-Source: AMrXdXv7NM87yLoleAYA4D0YocXfVHjvVY8pPDC2bBtZR5pk81PW1UuhHEL66XPLPvsbJmM+R4iJ X-Received: by 2002:a05:600c:c8a:b0:3d9:7062:e0b7 with SMTP id fj10-20020a05600c0c8a00b003d97062e0b7mr36374998wmb.33.1673107895289; Sat, 07 Jan 2023 08:11:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1673107895; cv=pass; d=google.com; s=arc-20160816; b=z76JWZx1K98btjhbiR5mlSbj1422omXH6KaE/Bzx2kY/CbcnMbgPh+bc29z3kR3im2 Ez+PSL6jBNv2pDddaTSOrKGeJ7eGdXgTkXgwdZGatA0/liaOca9/1PHlZDO0B77um+2o BtIZlAqrYJln9vCOUT/VJD/Nv9gZdvCzBzuOm1rBXMOkoZOSUtyfQ9C7uGGYn79tuXx8 UiLuccf4zMra1Xq6VXyVLjI+JP3zUFrML74B1x3vt6W+U4xlyXRo0JIsXjyaoA8U5ffP 2mNa1WQkfPQ9wEyhQRwzfxF5ssGMRX5GPiNPq+FIn5+7mwju11vi02t6qi+BZnpCOSl9 13ew== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=ZTQ10v1+8Xd2FqOLyJy3rNSu99bgJoDXB+cy+HhNEzQ=; b=Geqbm95m8SHAhvGHpC/lB12tgAev6qbEAOhWYVb+FQEOJ4mkX/qDUrAxMjq3w/PyKk 53Tq/Tw+bwho064THF2uu9GJxsL5sdiTNqxqoDdXBrZyqqzowVQjvpm3bTydKqNz5fYn ZRK1K9xCktluP1EfldyzEPrfghA4BMcpySWylDG7Uy/c0AvqRmJeKYWWhtrCUqNubIPB RTY436PzHYdwfnyzjH3qxwpLdSLLfosJjaN0cx4SmAgd9kBML/L4q9s7ul73jdJ+IpS7 aDzCVM2TXOJazv8I/4iy8Q0AcU1seiiznSGCxKon0Utmh0CNtMqbFJdIz5b193to9Jx9 swhQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="D4Gve/It"; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.7.78 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2078.outbound.protection.outlook.com. [40.107.7.78]) by gmr-mx.google.com with ESMTPS id z24-20020a1cf418000000b003c4ecff4e2bsi182761wma.1.2023.01.07.08.11.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Jan 2023 08:11:35 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.7.78 as permitted sender) client-ip=40.107.7.78; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="D4Gve/It"; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.7.78 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iLr025iZrEfRkkXAx/Pk4TK2qFu3ZKILQir2ivoQBirSmiv7BM3RRfwQuNuKcKnKEGFYf3tXzcuKnmbLkJEstCHf5c9/i2D4WVcOy/3sRPqLC0Og4I4o3CLnKo/h+RhEHgSZQvZsLRT1aPADzgCIqV6HOwwO8p6phvPUC+wTm3kN30qmJhZPckx/HwWWC7xIG7nkoQS7ewkMNNVuozFGJOp1pt9YFY8SqbSQNbaVtXeqJHx85J7x/88feYtkkf7NnQogD09uDZWPlP0rTsjkGYY41nuR+9S2zjI379QeIGe46lUcY99Zt1/RewOV7U0r1B9VfZ6KPhl4sdLc43zM1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZTQ10v1+8Xd2FqOLyJy3rNSu99bgJoDXB+cy+HhNEzQ=; b=HWMj3ll6GoMm6ULfIqmwzGpjgOb21FiJfG/zRPFqFpG5+dA/42bHadc0Xm4WwMK0jrpMFA3ncZFmvvTpY1yu9Rqh4s8ICVfacCXMVKE41nw85xbpjAHnLq7EI5g8Do5FvDIpZprylcKhbbYj3gcI51SHDRi+rjWkIIsILscn3bBYKldYZpdTh+aEo21QNpZd9HRs/TiXhiwB1K0a0n64P87MZHF61Mi2Ni9APEOSI1rpxkPaqP7IEoXEyJNSIgmTA1pnp5h1moRvHiMcmNw/EOa6FiVYd0zL8Fb7cMBZS8CIeI7Xv3XLw/c4mlBauoEC84K3BRjtQLCl52H8AALZ5A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZTQ10v1+8Xd2FqOLyJy3rNSu99bgJoDXB+cy+HhNEzQ=; b=D4Gve/ItJELUZchBubnECvV00uLFGVx6n0rZf0RzHYB3CoPP580C9oRzv5SjiruQLwsCYn6OtQv6LuXReELUHC3qdhG8ClyhrY2wKEBOSphlMv5NBqLt2gx/NJou4WsSmhz9ZSY0CqtoJ9HH3XPnODa9w/g9hK6510g5tNbkwwgg2E2u1wknOuFkQvB8rT8nR3mSniPE3u2nka48mBRlky76LbPj1cvYIMEJnhLHQmSZjpzpBThoKzVQD7DEOQ3Pk1Nnv8N2D5Sn6g8GyIjQUtMut3SuDlmPKY/YGgkIjGmqekT0VLbkS8Q82uaZ4H8b7uW3bHoPJfJJVerKKsrWJQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by AM7PR10MB3608.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:134::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Sat, 7 Jan 2023 16:11:33 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::bdf0:fdeb:f955:bc79]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::bdf0:fdeb:f955:bc79%3]) with mapi id 15.20.5944.019; Sat, 7 Jan 2023 16:11:33 +0000 Date: Sat, 7 Jan 2023 17:11:30 +0100 From: Henning Schild To: venkata.pyla@toshiba-tsip.com Cc: isar-users@googlegroups.com, amikan@ilbers.de, jan.kiszka@siemens.com, kazuhiro3.hayashi@toshiba.co.jp, dinesh.kumar@toshiba-tsip.com Subject: Re: [PATCH] repro-build-test.py: Fix flake8 issues Message-ID: <20230107171130.5eb3599b@md1za8fc.ad001.siemens.net> In-Reply-To: <20230107115818.8267-1-venkata.pyla@toshiba-tsip.com> References: <20230107115818.8267-1-venkata.pyla@toshiba-tsip.com> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.35; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR2P281CA0125.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9d::19) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR10MB5780:EE_|AM7PR10MB3608:EE_ X-MS-Office365-Filtering-Correlation-Id: b9040058-e7fe-4116-36a8-08daf0c9d834 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pwbcQYCntALxXJGwJdLlpnoJdCOgC4nogxTJtpj+EyGVQdHU6QsVaaa0XILoFW+Y4do+gDI5I+q2OQ9Eumnxw0cDIKgVwR1gDvv4M3ibRAScYX7kTLSwWe/Y0/3Mtxl1ChjzboC9ZoXhZEHB/G7wkOhGUTqZh2Dl8p2ZH8X1U+t7b1nyAThIF7QcoY6pQjquSL7+oRoIxSKa+GT+m/onTT4DS5wEfzyqio66riYu0wcudfFuHOkiOQWApF9O1DRgo1M+k07kBa58PfMa8wMWkuqIO4KFak9DAS+leJwdkBJTNGtuy8H1jt119Q8ZCAX//VgQZWzNkec6tP2581Rl/rq1czZ4X6jiJ7Vu9RY1IrVBKWqeXskQIxW5ToawyuE/6BVm8ApHpA437ZMjLGl1DYm2VCAeKrBSRgQ38Wx9/pVKLj1J+f6kCYK7EW3FvxYiqzYtWcAOGXvodoplXh4xBXhDjiM7lFcEX3Kfnzd3ZNuV6vPDdnFi4nBfPp83FfOIh3K7LK0aCq6puTRegnIOcB1P+t62uZwzm37vyjchHGg2Ial97t8yDZ6WldNPyWnzKDhWj/KDsC9t+dxyOWuop9A+LqGrwGw3+e0dej8Vd9Q97B9X156lS7bSz4jFPd5TIiO/bick6KJvyr3cRvi+Ow== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230022)(4636009)(396003)(136003)(376002)(366004)(346002)(39860400002)(451199015)(41300700001)(8936002)(6486002)(66946007)(8676002)(5660300002)(4326008)(66556008)(66476007)(44832011)(6916009)(316002)(6506007)(6512007)(478600001)(186003)(9686003)(2906002)(86362001)(83380400001)(1076003)(82960400001)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CsZf/1kmw4LmNJUaTX4rRLfFW7FUA2/9ZtNgf4Pe0IrU4CM+XrtaMPUy2NEs?= =?us-ascii?Q?DW/X/kJroVAyFdqkGGUXXYHelD+bbaB3u4Wwywt8VEz0VUcS7pGkzS3ktNyn?= =?us-ascii?Q?oUidi27h7u1BCssaLyIc2ZwMvSHlbXeiS4OYRXbFhSMDLEmkR0itVtGT5HND?= =?us-ascii?Q?5cRg0E8/cQUvTUtQ351FHejeGim1P8AAulj9WXb+OV8VnKjMobOoedirwafF?= =?us-ascii?Q?r3ENPNLwo+9e3HK45qDNnG9Vpnjzst0KKtLau34C/UfzdDsQHeBbz+WbWXKK?= =?us-ascii?Q?fr91rIsdwMFKbWEPrG9aivb4LA4PP0EK4FoNXaCBwDWiptF5nXcwtzNRkVMc?= =?us-ascii?Q?wX/fECQYzjozV9oC9jb5UfsZX31KVSb05C+voVoZohfT8AjZLx9fgIYyssBy?= =?us-ascii?Q?9Na6IZnAFMW4OUi1IvBVb99meck/3zPYXW7Smbb3SCumj0yJQX41WUf7gesM?= =?us-ascii?Q?WYZI6xlpwRPWws+UEjnaUQUx0DMoanKvOVatSCawq+6GL4gCdFSAM8GF1xBn?= =?us-ascii?Q?aZTv84RCz8xcoUdl4QHe7yuv8152AUjt7M2URLvQozW5+Qkij9mnb7jrek1F?= =?us-ascii?Q?8Gd5rT0re/SdYEjKcxjl29tKDj34Eu/TS+siJhfWo5syYH8Gbxrm11ix3y2w?= =?us-ascii?Q?nae8AL0LPtHOdl5C0Iv8KHvLDine5/2uOrc03BFU34IlGnmGi+TgAaYT9phL?= =?us-ascii?Q?pSX4WlyctUlrK0CNqIquMc5RQ6f4xdF6ZndcNJRBfX568mata1qrpR4242KB?= =?us-ascii?Q?5nExW5e1N5PQ6NdrpX7ARmmF7lhG+gSnMYdiavz76ztPsAp+CXDpETjFERzA?= =?us-ascii?Q?7L08K1TpvKlqiwwDy8/FVhHnaiE1OuZHrGWfLcs+fIcy+fFWYirMdg/htaPh?= =?us-ascii?Q?FO1pAwmW1VBy8Qptsztyl45yBgi3oNuJ7bWGQOgw2TX5jgpaFKKBo9iVjeg7?= =?us-ascii?Q?dTrj1NFcJJg6RB4KGRXPHCm8sTNp0occsIxqDe/z5EUexWgu8UddoJBfo9Q4?= =?us-ascii?Q?A1q8hpXari9eKNsLIfBZPfuE9fWqLkdX5vAS8oqp/rvx5Lou1dshQzEFV20/?= =?us-ascii?Q?mrF0Oilp7qpWyi5wQzsBY0frMEKGm2cgEZ/BYFXvKowqWbibo3bY12G8rjNX?= =?us-ascii?Q?u+ciPosM8RTHDewEf2C583uKMs6zVETJBDqsWAPIeUnCofHcxzRZBZJHumPp?= =?us-ascii?Q?SPoYi6UDeGcEgh4vKuO667tmFK8M0JUIiAVunZMAhmkvyMW5uMVNBC59iC4L?= =?us-ascii?Q?dvB5bdZE0lJ7uZpp04FNlvDDdFXp+PXGqJ44SJz3Ejk+ePRY6UPttrU8twm+?= =?us-ascii?Q?7k9FlDEAIANLpY51YnwgRctYIK2ip2AVcyfB7dVJgeQLDEWvPNhmjll2JBgw?= =?us-ascii?Q?Vm7DDDSvsNxo/KN8M/F1UqjjKaoAV6WvCchFzaXbT3ZtByKsikJhaq0HYPan?= =?us-ascii?Q?fRjvkMgbdaXepWCzwITDfWSuUnskuicrBHu7142PAkDOvQo+VJJ1IH6uh2EQ?= =?us-ascii?Q?uYTgVOztbtxP8aQaUReBu1XUsPjC7xyuiyA4QAdT3ZIJMCPxMquyyrxBxf6m?= =?us-ascii?Q?32HoxSOtvkvfLnpxYaPXBWKfF89kzp79GpVNVRxdUxTE+EhDmAd7MqlbHOGN?= =?us-ascii?Q?kBP2LVzVda3976fCeO+Fxhp2FO6nx4l6/WDnhKhvlpTfjvC9+Mti8HbPpFRZ?= =?us-ascii?Q?Mz5Hcw=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: b9040058-e7fe-4116-36a8-08daf0c9d834 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2023 16:11:33.4302 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uiSuRjR2wvGb76wxSXVA4BPVOIAErTB3EbEz3KGTQ7X31VuknElq1I3/8A/sVExizCMN+/n8SWfezYAj5PgvwzIADmMygW8Ko5HPrfHh3oU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3608 X-TUID: qTkIGWRAqELh Thanks! Am Sat, 7 Jan 2023 17:28:18 +0530 schrieb venkata.pyla@toshiba-tsip.com: > From: venkata pyla > > It fixes following flake8 errors > > F401 'glob' imported but unused > F401 'os' imported but unused > F401 're' imported but unused > F401 'tempfile' imported but unused > F401 'time' imported but unused > F401 'cibuilder.isar_root' imported but unused > E302 expected 2 blank lines, found 1 > E501 line too long (97 > 79 characters) > E501 line too long (106 > 79 characters) > E203 whitespace before ',' > E231 missing whitespace after ',' > E501 line too long (91 > 79 characters) > E501 line too long (89 > 79 characters) > E501 line too long (84 > 79 characters) > E128 continuation line under-indented for visual indent > E128 continuation line under-indented for visual indent > E128 continuation line under-indented for visual indent > E203 whitespace before ',' > E128 continuation line under-indented for visual indent > E251 unexpected spaces around keyword / parameter equals > E251 unexpected spaces around keyword / parameter equals > > black: converts single quote strings to double quotes > > Signed-off-by: venkata pyla > --- > testsuite/repro-build-test.py | 64 > ++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), > 28 deletions(-) > > diff --git a/testsuite/repro-build-test.py > b/testsuite/repro-build-test.py index e89becf..5d92e2c 100755 > --- a/testsuite/repro-build-test.py > +++ b/testsuite/repro-build-test.py > @@ -1,14 +1,9 @@ > #!/usr/bin/env python3 > > -import glob > -import os > -import re > -import tempfile > -import time > - > -from cibuilder import CIBuilder, isar_root > +from cibuilder import CIBuilder > from avocado.utils import process > > + > class ReproBuild(CIBuilder): > > """ > @@ -16,29 +11,38 @@ class ReproBuild(CIBuilder): > > :avocado: tags=repro-build > """ > + > def test_repro_build(self): > - target = self.params.get('build_target', > default='mc:qemuamd64-bullseye:isar-image-base') > - source_date_epoch = self.params.get('source_date_epoch', > default=self.git_last_commit_timestamp()) > + target = self.params.get( > + "build_target", > default="mc:qemuamd64-bullseye:isar-image-base" > + ) > + source_date_epoch = self.params.get( > + "source_date_epoch", > default=self.git_last_commit_timestamp() > + ) > self.init() > - self.build_repro_image(target, source_date_epoch, > 'image1.tar.gz') > - self.build_repro_image(target, source_date_epoch, > 'image2.tar.gz') > - self.compare_repro_image('image1.tar.gz', 'image2.tar.gz') > + self.build_repro_image(target, source_date_epoch, > "image1.tar.gz") > + self.build_repro_image(target, source_date_epoch, > "image2.tar.gz") > + self.compare_repro_image("image1.tar.gz", "image2.tar.gz") > > def git_last_commit_timestamp(self): > - return process.run('git log -1 --pretty=%ct').stdout > + return process.run("git log -1 > --pretty=%ct").stdout.decode().strip() > def get_image_path(self, target_name): > image_dir = "tmp/deploy/images" > - target_params = target_name.split(':') > - machine = target_params[1].split('-')[0] > - distro = 'debian-' + target_params[1].split('-')[1] > + target_params = target_name.split(":") > + machine = target_params[1].split("-")[0] > + distro = "debian-" + target_params[1].split("-")[1] Was this ever tried against ubuntu? Henning > image_type = target_params[2] > - return > f'{image_dir}/{machine}/{image_type}-{distro}-{machine}.tar.gz' > + return > f"{image_dir}/{machine}/{image_type}-{distro}-{machine}.tar.gz" > - def build_repro_image(self, target, source_date_epoch=None > ,image_name='image.tar.gz'): > + def build_repro_image( > + self, target, source_date_epoch=None, > image_name="image.tar.gz" > + ): > > if not source_date_epoch: > - self.error("Reproducible build should configure with > source_date_epoch time") > + self.error( > + "Reproducible build should configure with > source_date_epoch time" > + ) > > # clean artifacts before build > self.clean() > @@ -54,15 +58,19 @@ class ReproBuild(CIBuilder): > self.move_in_build_dir(image_path, image_name) > > def clean(self): > - self.delete_from_build_dir('tmp') > - self.delete_from_build_dir('sstate-cache') > + self.delete_from_build_dir("tmp") > + self.delete_from_build_dir("sstate-cache") > > def compare_repro_image(self, image1, image2): > - self.log.info("Compare artifacts image1: " + image1 + ", > image2: " + image2) > - result = process.run('diffoscope ' > - '--text ' + self.build_dir + > '/diffoscope-output.txt' > - ' ' + self.build_dir + '/' + image1 + > - ' ' + self.build_dir + '/' + image2 , > - ignore_status = True) > + self.log.info( > + "Compare artifacts image1: " + image1 + ", image2: " + > image2 > + ) > + result = process.run( > + "diffoscope " > + "--text " + self.build_dir + "/diffoscope-output.txt" > + " " + self.build_dir + "/" + image1 + > + " " + self.build_dir + "/" + image2, > + ignore_status=True, > + ) > if result.exit_status > 0: > - self.fail(f'Images {image1} and {image2} are not > reproducible') > + self.fail(f"Images {image1} and {image2} are not > reproducible")