From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7231095922578423808 X-Received: by 2002:a17:90a:2e0d:b0:24e:2846:e51a with SMTP id q13-20020a17090a2e0d00b0024e2846e51amr4036586pjd.5.1683620717701; Tue, 09 May 2023 01:25:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:6b07:b0:19c:a86d:b340 with SMTP id o7-20020a1709026b0700b0019ca86db340ls23867442plk.9.-pod-prod-gmail; Tue, 09 May 2023 01:25:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5+/qQQNfRLWkxqgGXZP1SqXWoARR1FM0yenEgTrXSY4yLAanOBJm/IY5YHueEFhBTZ8SrR X-Received: by 2002:a17:90b:a48:b0:24d:f2f5:f571 with SMTP id gw8-20020a17090b0a4800b0024df2f5f571mr13494428pjb.36.1683620716804; Tue, 09 May 2023 01:25:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683620716; cv=none; d=google.com; s=arc-20160816; b=q7ijZZ5XndVkRNF00taB8D0lK70afK/vAgmXG147PArElC1L2v28HSN00dE2I6w6uI EFWF53DCiQstrJB3m3WgYd7FBdCAviQJL70DKxdtn6Ht9lrQTpwzgPP5gaBHWaApn5tF qDgvwJoZtH0Yf/QRaplGDaMiySGUgYYN5pu+2IZARwi8Wz4YAtaifMSAXwVPllnk9spa k3p9tjfyQFZWczsLKHPty7SAm4f9WRw5CPlA6icO972p4dWglov7OypsjTEynLjFmNo2 oS1hHwBnFyvQGO9GVhNMBcLB1dFAu6OJ7dA4LuENR9pmDnB32cmqVFYroHz78chGjGCv zN+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=eiciTVR3MTAz/OMfouRlJ/tZuU8KyciiVTIbN4PQccI=; b=hTGqjeZ2QjP+VfqF37oTqCO+WXaANUcPAHBzAzp3U7fl7r4GaNBmai/wULAd38ackP E5fgwJb4pnxuQuJ/UUAeafj27QvpJVG2EKU3T3BwZHomDr/8PIDnDczHUZQjMuUZArfP rpelIlTSGs5hTrkxSPYf9/yd9xC6Kz0+0oP+YqVJkZQrq0BnJM6L7EbuyzRI6mB7+115 FWRuLPGd7mXhY4tpsZD5q4Cy6w8QUrlrB0O3rD1RMQ9gt9Jkl99v2JYus4khDMNIsUNT d3O0ndfEfFLeQ/8NSfFRTtYaB/L+d6qkgJdWnoLudmD4hePqj8rZgdGVwK8PHIWN2Wpu eNBA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id bf5-20020a656d05000000b005285b1a77d6si48216pgb.0.2023.05.09.01.25.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 May 2023 01:25:16 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.. ([85.254.75.115]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 3498PAUi031005 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 9 May 2023 10:25:11 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH] testsuite: Always cleanup gpg agent Date: Tue, 9 May 2023 11:25:08 +0300 Message-Id: <20230509082508.1658927-1-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: NzMncyJwraXU In addition to 1284155a cleanup gpg agent even if test fails. Signed-off-by: Anton Mikanovich --- testsuite/cibase.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/testsuite/cibase.py b/testsuite/cibase.py index d1543a9b..df8b350e 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -42,24 +42,26 @@ class CIBaseTest(CIBuilder): if result.exit_status: self.fail('GPG import failed') - self.bitbake(targets, **kwargs) + try: + self.bitbake(targets, **kwargs) - self.delete_from_build_dir('tmp') - self.configure(gpg_pub_key=gpg_pub_key if signed else None, offline=True, sstate_dir="", **kwargs) + self.delete_from_build_dir('tmp') + self.configure(gpg_pub_key=gpg_pub_key if signed else None, offline=True, sstate_dir="", **kwargs) - self.bitbake(targets, **kwargs) + self.bitbake(targets, **kwargs) - # Disable use of cached base repository - self.unconfigure() + # Disable use of cached base repository + self.unconfigure() - if not signed: - # Try to build with changed configuration with no cleanup - self.configure(**kwargs) - self.bitbake(targets, **kwargs) + if not signed: + # Try to build with changed configuration with no cleanup + self.configure(**kwargs) + self.bitbake(targets, **kwargs) - # Cleanup - process.run('gpgconf --kill gpg-agent') - shutil.rmtree(gnupg_home, True) + finally: + # Cleanup + process.run('gpgconf --kill gpg-agent') + shutil.rmtree(gnupg_home, True) def perform_ccache_test(self, targets, **kwargs): def ccache_stats(dir, field): -- 2.34.1