Message ID | 20210119183010.12831-4-andrew.gregory.8@gmail.com |
---|---|
State | Accepted, archived |
Headers | show
Return-Path: <pacman-dev-bounces@lists.archlinux.org> Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.15) for <fetchmail@localhost> (single-drop); Tue, 19 Jan 2021 18:30:56 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id YKDnIV8lB2BjngYAK+/4rw (envelope-from <pacman-dev-bounces@lists.archlinux.org>) for <patchwork@archlinux.org>; Tue, 19 Jan 2021 18:30:55 +0000 Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by mail.archlinux.org (Postfix) with ESMTPS id 3E0083812C4; Tue, 19 Jan 2021 18:30:55 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 52F532C506; Tue, 19 Jan 2021 18:30:46 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 2A2D12B77C for <pacman-dev@lists.archlinux.org>; Tue, 19 Jan 2021 18:30:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on luna.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FROM=0.5, RCVD_IN_DNSWL_MED=-2.3,T_DMARC_POLICY_NONE=0.01, T_DMARC_SIMPLE_DKIM=0.01 autolearn=failed autolearn_force=no version=3.4.4 X-Spam-BL-Results: <dns:206.137.207.98.zen.spamhaus.org> [127.0.0.10] <dns:61.189.216.95.list.dnswl.org> [127.0.9.2] <dns:206.137.207.98.dnsbl.sorbs.net> [127.0.0.10] Received: from mail.archlinux.org (mail.archlinux.org [95.216.189.61]) by luna.archlinux.org (Postfix) with ESMTPS for <pacman-dev@lists.archlinux.org>; Tue, 19 Jan 2021 18:30:44 +0000 (UTC) Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.archlinux.org (Postfix) with ESMTPS id 7723F3812A1 for <pacman-dev@archlinux.org>; Tue, 19 Jan 2021 18:30:43 +0000 (UTC) Received: by mail-pl1-x62d.google.com with SMTP id t6so11012102plq.1 for <pacman-dev@archlinux.org>; Tue, 19 Jan 2021 10:30:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gzc+QOwHSxSk21l2YGaKytbKui0DGAIEknR/LSni40g=; b=HT1SNouFBLRf1lw9AFOjiyGH3dC4538cHdA4mZLXxy9zCrsEQ+U5G45FAR0zxLLHyD sx7IhrXxQMXdnhOu/wQG7JrrChT2VzjXx1OcpyajYHERJdWUcvU8cHNDolkyyq08zOcj bULkvEBmf1/wuv0Tbd1Nr4zcdPXg+U31WpPCiz3NijW136YLEseT+00Uk3IqHw/v6EbS eUwupaXwRG3XmB93j4q8BCtlSsN/yGqyoSW3+pxK2hMiJQ4zvOdNU/1Fn1Dhm4UYEilY LWy+UXXhK5pJ8aRaOaNzl2HXjHCnLjYfxFVZZrLz5/zKk4eyCH4cdLvLXBAitsTJy6eq KSAg== 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=gzc+QOwHSxSk21l2YGaKytbKui0DGAIEknR/LSni40g=; b=s8Ym0v+b4IF+HIItmlitaMFBopdm8e9eRQpwJatxNorResOE26HsDhplhet9V26lw+ V//GAOA5ghlkuH+WLSP9/0qlMAEW5Ohlza9e5nvIHAE924OooubeooVKJVGpqRe7sUr3 GC5Ivut1Z7h/3scKXZ4NKYDWHh/bGDaUP+8PTJXi8HrNhZIrdfRwQRAPIW2wLPmGKnMI R8OV7aikENYRojF6/x24EaJj3Ix8er4mjzAll0TSlkLSZC7AaRxgVS8FT7P5q0/U/A8r cY0tQLdsw7SHpiikIDwspVOSSulkHTQ7ihCl/ANbulkxhyygDVH7FbhL/yAsaCLW0Aoa AmKQ== X-Gm-Message-State: AOAM532v8LLcZ5PpHcpVPLZ9AJ2Bbr2JadNJxLOLeCpoT4L7XWU/51/Q dPbGiuPYsz4uyY5jpO+5DZths6NFLp8= X-Google-Smtp-Source: ABdhPJyg/BwqT4Xzl0CdUL4rEYjPHiO+f+6Jm5I8aeMF0UHFP+RpUqWpx+RWZcBo0gpKKVLvEJ1wtQ== X-Received: by 2002:a17:902:e80c:b029:de:a20b:7a9c with SMTP id u12-20020a170902e80cb02900dea20b7a9cmr6218959plg.12.1611081041055; Tue, 19 Jan 2021 10:30:41 -0800 (PST) Received: from localhost.localdomain (c-98-207-137-206.hsd1.ca.comcast.net. [98.207.137.206]) by smtp.gmail.com with ESMTPSA id t8sm3647685pjd.51.2021.01.19.10.30.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 10:30:40 -0800 (PST) From: Andrew Gregory <andrew.gregory.8@gmail.com> To: pacman-dev@archlinux.org Cc: Andrew Gregory <andrew.gregory.8@gmail.com> Date: Tue, 19 Jan 2021 10:30:07 -0800 Message-Id: <20210119183010.12831-4-andrew.gregory.8@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210119183010.12831-1-andrew.gregory.8@gmail.com> References: <20210119183010.12831-1-andrew.gregory.8@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [pacman-dev] [PATCH 4/7] add CACHE_FEXISTS and CACHE_FCONTENTS test rules X-BeenThere: pacman-dev@lists.archlinux.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion list for pacman development <pacman-dev.lists.archlinux.org> List-Unsubscribe: <https://lists.archlinux.org/options/pacman-dev>, <mailto:pacman-dev-request@lists.archlinux.org?subject=unsubscribe> List-Archive: <https://lists.archlinux.org/pipermail/pacman-dev/> List-Post: <mailto:pacman-dev@lists.archlinux.org> List-Help: <mailto:pacman-dev-request@lists.archlinux.org?subject=help> List-Subscribe: <https://lists.archlinux.org/listinfo/pacman-dev>, <mailto:pacman-dev-request@lists.archlinux.org?subject=subscribe> Reply-To: Discussion list for pacman development <pacman-dev@lists.archlinux.org> Errors-To: pacman-dev-bounces@lists.archlinux.org Sender: "pacman-dev" <pacman-dev-bounces@lists.archlinux.org> Authentication-Results: mail.archlinux.org; dkim=fail (headers rsa verify failed) header.d=gmail.com header.s=20161025 header.b=HT1SNouF; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (mail.archlinux.org: domain of pacman-dev-bounces@lists.archlinux.org designates 5.9.250.164 as permitted sender) smtp.mailfrom=pacman-dev-bounces@lists.archlinux.org X-Rspamd-Queue-Id: 3E0083812C4 X-Spamd-Result: default: False [4.59 / 15.00]; HAS_REPLYTO(0.00)[pacman-dev@lists.archlinux.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; GREYLIST(0.00)[pass,meta]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:5.9.250.164:c]; R_DKIM_REJECT(1.00)[gmail.com:s=20161025]; FREEMAIL_FROM(0.00)[gmail.com]; BROKEN_CONTENT_TYPE(1.50)[]; R_MISSING_CHARSET(2.50)[]; NEURAL_SPAM(0.00)[0.153]; DKIM_TRACE(0.00)[gmail.com:-]; RCPT_COUNT_TWO(0.00)[2]; MAILLIST(-0.20)[mailman]; RECEIVED_SPAMHAUS_PBL(0.00)[98.207.137.206:received]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:24940, ipnet:5.9.0.0/16, country:DE]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[andrewgregory8@gmail.com,pacman-dev-bounces@lists.archlinux.org]; FROM_HAS_DN(0.00)[]; TAGGED_RCPT(0.00)[]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; FREEMAIL_CC(0.00)[gmail.com]; RCVD_COUNT_SEVEN(0.00)[7]; FORGED_SENDER_MAILLIST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : SPF not aligned (relaxed),none] X-Rspamd-Server: mail.archlinux.org |
Series |
[pacman-dev,1/7] pacman: add -w to -U
|
expand
|
diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index 59293266..aef73cdb 100644 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -181,6 +181,16 @@ def check(self, test): if not pkg or not os.path.isfile( os.path.join(cachedir, pkg.filename())): success = 0 + elif case == "FEXISTS": + if not os.path.isfile(os.path.join(cachedir, key)): + success = 0 + elif case == "FCONTENTS": + filename = os.path.join(cachedir, key) + try: + with open(filename, 'r') as f: + success = f.read() == value + except: + success = 0 else: tap.diag("Rule kind '%s' not found" % kind) success = -1
The existing CACHE_EXISTS rule takes a package, which is not suitable for -U tests that need to be able to check for specific files. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> --- test/pacman/pmrule.py | 10 ++++++++++ 1 file changed, 10 insertions(+)