From unknown Tue Jun 17 01:42:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#52722] [PATCH] tests: Smarten up git repository testing framework. Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 22:35:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52722 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52722@debbugs.gnu.org Cc: Attila Lendvai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164012604629254 (code B ref -1); Tue, 21 Dec 2021 22:35:03 +0000 Received: (at submit) by debbugs.gnu.org; 21 Dec 2021 22:34:06 +0000 Received: from localhost ([127.0.0.1]:55956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznhu-0007bm-81 for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:34:06 -0500 Received: from lists.gnu.org ([209.51.188.17]:33008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznhm-0007b4-MB for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:34:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mznhm-00041U-GM for guix-patches@gnu.org; Tue, 21 Dec 2021 17:33:58 -0500 Received: from [2a00:1450:4864:20::530] (port=38911 helo=mail-ed1-x530.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mznhk-0000AC-V8 for guix-patches@gnu.org; Tue, 21 Dec 2021 17:33:58 -0500 Received: by mail-ed1-x530.google.com with SMTP id bm14so907089edb.5 for ; Tue, 21 Dec 2021 14:33:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0OcdR6vQRTSjCkc3U8/XeIuW9iwDx50UOXa8hQoarjM=; b=jd0vw19AhrQkVaDh5WfgPFMdmmJlbliZaEAER/4nQVpE7WkAsGgSD5hhlEbO16wEeA n14FOw+J4h8Mr4EDp0aVdKM9E9MiAu+QORxOT0LLPvQ4g3+CH7zpGOosCwSuaUnZwjVm ag+w0RfK76B12wlYwdfzA3j2bHD8klHvB1PCPMIW2AGbG8MVrO41o2hMmczrz3jpmJUI h4nmgvSUjNf8LUVYLbRfGo6EuH02OtuxPbGJeYNgEXNKnrhLBjVyH4031kulANCDOrlu wLRGMM+RoVKOqbDcXCV8wD67tMDyY7Sajm7joyeHHeBU9/RPMP/UDi/9JlWyCH9JlWfZ cs4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=0OcdR6vQRTSjCkc3U8/XeIuW9iwDx50UOXa8hQoarjM=; b=4174SUHZisn8WBMIhX3msauVSTWF1KL9aC0VAFlZIzs2tqL/D37UVogSmHrD3YcxgG rOGe7e65k0mm7fbHGuX1clQM88MoYRpLwWiB+0CPFby/V+PjdV07GhUw8/gzheA5Tb95 WoxZcfPQaA2pwAml6T0Ngw8jEyLteKcSOUqJYClVRc/jRlDyYmuIsdp6pglZQF9qTx6I 7yzWPNvsllemaBsWFtrRKScVDo0GT681LPkiQH/DljUJR0c3cbEW2m+RoWhSRFmRalgz quErAWk+LjIhcqirxzPy35XO5nZgmCz4e907f2ro6VoWSPyeScVF7F8ZEhbfyQsoIVzr d2gQ== X-Gm-Message-State: AOAM5312ypHYKAdPeayhdXTnn447u8cqmfvq+Y3aBJO34V3qIppf1dLj /h4HXmkGonIrYCVJNpgk64oW1nbaHQgLQQ== X-Google-Smtp-Source: ABdhPJwZun8rbrlsGSzGdrkry/FbCSTeh/JT4gWvuYJP08nX+Y+EL5k9rekFIJWq7VDvi8UmYxBBOQ== X-Received: by 2002:a17:906:649c:: with SMTP id e28mr337341ejm.60.1640126025854; Tue, 21 Dec 2021 14:33:45 -0800 (PST) Received: from localhost.localdomain ([2a02:ab88:3700:b180:6072:12a9:8472:9a8f]) by smtp.gmail.com with ESMTPSA id hq29sm54462ejc.141.2021.12.21.14.33.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 14:33:45 -0800 (PST) From: Attila Lendvai Date: Tue, 21 Dec 2021 23:32:41 +0100 Message-Id: <20211221223244.32542-1-attila@lendvai.name> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::530 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=attila.lendvai@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.8 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: These features will be used in upcoming tests. * guix/tests/git.scm (with-git-repository): New macro that can be used multiple times, inside a with-temporary-git-repository. (populate-git-repository): Extend the DSL with (add "some-noise"), (reset [...] Content analysis details: (1.8 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.51.188.17 listed in wl.mailspike.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (attila.lendvai[at]gmail.com) 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 T_SPF_TEMPERROR SPF: test of record failed (temperror) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different 1.3 SPOOFED_FREEMAIL No description available. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.9 (-) These features will be used in upcoming tests. * guix/tests/git.scm (with-git-repository): New macro that can be used multiple times, inside a with-temporary-git-repository. (populate-git-repository): Extend the DSL with (add "some-noise"), (reset "[commit hash]"), (checkout "branch" orphan). * guix/tests/gnupg.scm (key-fingerprint-vector): New procedure. --- guix/tests/git.scm | 23 +++++++++++++++++++++-- guix/tests/gnupg.scm | 8 ++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/guix/tests/git.scm b/guix/tests/git.scm index 69960284d9..76f5a8b937 100644 --- a/guix/tests/git.scm +++ b/guix/tests/git.scm @@ -26,6 +26,7 @@ (define-module (guix tests git) #:use-module (ice-9 control) #:export (git-command with-temporary-git-repository + with-git-repository find-commit)) (define git-command @@ -59,8 +60,9 @@ (define (git command . args) (apply invoke (git-command) "-C" directory command args))))) - (mkdir-p directory) - (git "init") + (unless (directory-exists? (string-append directory "/.git")) + (mkdir-p directory) + (git "init")) (let loop ((directives directives)) (match directives @@ -78,6 +80,9 @@ (define (git command . args) port))) (git "add" file) (loop rest))) + ((('add file-name-and-content) rest ...) + (loop (cons `(add ,file-name-and-content ,file-name-and-content) + rest))) ((('remove file) rest ...) (git "rm" "-f" file) (loop rest)) @@ -99,12 +104,18 @@ (define (git command . args) ((('checkout branch) rest ...) (git "checkout" branch) (loop rest)) + ((('checkout branch 'orphan) rest ...) + (git "checkout" "--orphan" branch) + (loop rest)) ((('merge branch message) rest ...) (git "merge" branch "-m" message) (loop rest)) ((('merge branch message ('signer fingerprint)) rest ...) (git "merge" branch "-m" message (string-append "--gpg-sign=" fingerprint)) + (loop rest)) + ((('reset to) rest ...) + (git "reset" "--hard" to) (loop rest))))) (define (call-with-temporary-git-repository directives proc) @@ -121,6 +132,14 @@ (define-syntax-rule (with-temporary-git-repository directory (lambda (directory) exp ...))) +(define-syntax-rule (with-git-repository directory + directives exp ...) + "Evaluate EXP in a context where DIRECTORY is (further) populated as +per DIRECTIVES." + (begin + (populate-git-repository directory directives) + exp ...)) + (define (find-commit repository message) "Return the commit in REPOSITORY whose message includes MESSAGE, a string." (let/ec return diff --git a/guix/tests/gnupg.scm b/guix/tests/gnupg.scm index 943fd66077..09f02a2b67 100644 --- a/guix/tests/gnupg.scm +++ b/guix/tests/gnupg.scm @@ -35,6 +35,7 @@ (define-module (guix tests gnupg) read-openpgp-packet key-fingerprint + key-fingerprint-vector key-id)) (define gpg-command @@ -82,7 +83,10 @@ (define (read-openpgp-packet file) (open-bytevector-input-port (call-with-input-file file read-radix-64)))) +(define key-fingerprint-vector + (compose openpgp-public-key-fingerprint + read-openpgp-packet)) + (define key-fingerprint (compose openpgp-format-fingerprint - openpgp-public-key-fingerprint - read-openpgp-packet)) + key-fingerprint-vector)) -- 2.34.0 From unknown Tue Jun 17 01:42:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#52722] [PATCH v2 1/2] tests: Smarten up git repository testing framework. References: <20211221223244.32542-1-attila@lendvai.name> In-Reply-To: <20211221223244.32542-1-attila@lendvai.name> Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Dec 2021 10:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52722 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52722@debbugs.gnu.org Cc: Attila Lendvai Received: via spool by 52722-submit@debbugs.gnu.org id=B52722.164016900529611 (code B ref 52722); Wed, 22 Dec 2021 10:31:02 +0000 Received: (at 52722) by debbugs.gnu.org; 22 Dec 2021 10:30:05 +0000 Received: from localhost ([127.0.0.1]:56866 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzysm-0007hT-M0 for submit@debbugs.gnu.org; Wed, 22 Dec 2021 05:30:05 -0500 Received: from mail-ed1-f45.google.com ([209.85.208.45]:35661) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzysl-0007gL-8r for 52722@debbugs.gnu.org; Wed, 22 Dec 2021 05:30:03 -0500 Received: by mail-ed1-f45.google.com with SMTP id y22so6836621edq.2 for <52722@debbugs.gnu.org>; Wed, 22 Dec 2021 02:30:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=a2QL/succ0L1iXQSgBVoyGo+FGx+7d0CVqqGBXzF8+s=; b=IDxj7Uu7D3GVEFJ6VNFGQ8fHsp1TCaU6Y20LiNkcauzwfVgAY4LurACywiaA2VLdIE LOemTFCTYKGr3YWk0noRbntn1W8L9hTTOqsOXCkHNfaZQ99a7gcejykaY7LXsT8mfYro HXeUyeJb0yhyRQ01BFr+PD3MMYYW+3XvOAg0NhU5aiARTOFtKyYPJOdn8QqdUye+t4pB C94SmHetfW5X9WivqsOlwCzDcTEJ+FUbCvQ0XpVyjwrOKdYhVFVzGilpOfB95ZsMixNF Ptw4aFpOIlbC7FwX7ndm/Wp2VcstHOXpjMI4rD1s+kUlvGfykCdhNe1SiGEGjmnrlWgB eRYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=a2QL/succ0L1iXQSgBVoyGo+FGx+7d0CVqqGBXzF8+s=; b=IZ+z94tidACOe/nh27twkJHskVoDdMX/Hcp5hAGV3G1cfci4/fDi+aqNQF2gFDuFoO +RD8pC2l1SzOLE3AVJgFkXtYkCXbnKotsviBIWLpFmVLXfUcymBpB0sHgn3X75QexMTe kVoBV48xZ0K6LRsUc72om21sZYX04q0gIRinNDnBuEsfXvCB+ZNcWwtm8TRw9Hc0Fng2 6im2xpzHjjPE6jb0KSIxremVplNru5DQ8Ur2my9D8cWHIkxiyVxm0mTY4mw1qGVPitxP b9mtIvuSqP249lB/XwtWqfKNG4shPzIhmHFI5kYAdPlmuEm667qEqCiJO4jKfBJwWWKO TRaA== X-Gm-Message-State: AOAM532Nn749TicVTC0A4DU18xplmgGJKkLdx8w6SE9voqsR11fegarh PLWs7IKfnBm5ItkIQi/+jcS9oVPwTBRP3A== X-Google-Smtp-Source: ABdhPJxjwwsbcuytCvLebtTVmgMNoHooD18r9vhjKtBImzWMH5a9W31uq/Qtx+YG81ZslLoZBe2a/g== X-Received: by 2002:a17:907:8a04:: with SMTP id sc4mr1955465ejc.508.1640168997118; Wed, 22 Dec 2021 02:29:57 -0800 (PST) Received: from lelap.lan (catv-80-99-178-127.catv.broadband.hu. [80.99.178.127]) by smtp.gmail.com with ESMTPSA id cs12sm601840ejc.15.2021.12.22.02.29.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 02:29:56 -0800 (PST) From: Attila Lendvai Date: Wed, 22 Dec 2021 11:28:55 +0100 Message-Id: <20211222102855.21822-1-attila@lendvai.name> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * guix/tests/git.scm (with-git-repository): New macro, exported. It can be used repeatedly inside a WITH-TEMPORARY-GIT-REPOSITORY. (populate-git-repository): Extend the DSL with (ADD "some-noise"), (RESET "[commit hash]"), (CHECKOUT "branch" ORPHAN). --- as requested on IRC, resending it as two commits. guix/tests/git.scm | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/guix/tests/git.scm b/guix/tests/git.scm index 69960284d9..76f5a8b937 100644 --- a/guix/tests/git.scm +++ b/guix/tests/git.scm @@ -26,6 +26,7 @@ (define-module (guix tests git) #:use-module (ice-9 control) #:export (git-command with-temporary-git-repository + with-git-repository find-commit)) (define git-command @@ -59,8 +60,9 @@ (define (git command . args) (apply invoke (git-command) "-C" directory command args))))) - (mkdir-p directory) - (git "init") + (unless (directory-exists? (string-append directory "/.git")) + (mkdir-p directory) + (git "init")) (let loop ((directives directives)) (match directives @@ -78,6 +80,9 @@ (define (git command . args) port))) (git "add" file) (loop rest))) + ((('add file-name-and-content) rest ...) + (loop (cons `(add ,file-name-and-content ,file-name-and-content) + rest))) ((('remove file) rest ...) (git "rm" "-f" file) (loop rest)) @@ -99,12 +104,18 @@ (define (git command . args) ((('checkout branch) rest ...) (git "checkout" branch) (loop rest)) + ((('checkout branch 'orphan) rest ...) + (git "checkout" "--orphan" branch) + (loop rest)) ((('merge branch message) rest ...) (git "merge" branch "-m" message) (loop rest)) ((('merge branch message ('signer fingerprint)) rest ...) (git "merge" branch "-m" message (string-append "--gpg-sign=" fingerprint)) + (loop rest)) + ((('reset to) rest ...) + (git "reset" "--hard" to) (loop rest))))) (define (call-with-temporary-git-repository directives proc) @@ -121,6 +132,14 @@ (define-syntax-rule (with-temporary-git-repository directory (lambda (directory) exp ...))) +(define-syntax-rule (with-git-repository directory + directives exp ...) + "Evaluate EXP in a context where DIRECTORY is (further) populated as +per DIRECTIVES." + (begin + (populate-git-repository directory directives) + exp ...)) + (define (find-commit repository message) "Return the commit in REPOSITORY whose message includes MESSAGE, a string." (let/ec return -- 2.34.0 From unknown Tue Jun 17 01:42:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#52722] [PATCH v2 2/2] tests: gnupg: Factor out and export KEY-FINGERPRINT-VECTOR. Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Dec 2021 10:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52722 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52722@debbugs.gnu.org Cc: Attila Lendvai Received: via spool by 52722-submit@debbugs.gnu.org id=B52722.164016902029720 (code B ref 52722); Wed, 22 Dec 2021 10:31:02 +0000 Received: (at 52722) by debbugs.gnu.org; 22 Dec 2021 10:30:20 +0000 Received: from localhost ([127.0.0.1]:56874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzysy-0007jC-UE for submit@debbugs.gnu.org; Wed, 22 Dec 2021 05:30:20 -0500 Received: from mail-ed1-f42.google.com ([209.85.208.42]:44846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzysx-0007iq-GB for 52722@debbugs.gnu.org; Wed, 22 Dec 2021 05:30:15 -0500 Received: by mail-ed1-f42.google.com with SMTP id w16so6689624edc.11 for <52722@debbugs.gnu.org>; Wed, 22 Dec 2021 02:30:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nmklPRcQBj3cq3CRQjPKZ1zRRLuXwz9ilMULoKUY5C4=; b=ofaGCLf8NBRCNUFTECS1Gm2HUmuM7dPRhd+W5xRpwWxXu5llOg3OKe3HS5IYPpWn9r P4iU/LE9clIGyU0sbBpOO4Jmttm8pt0geA+pb0jfRnTZzJsmzE0d4mN64ARKls/eMa7N WfyH29IE87VLZrO1Kh7f4nJdrcmXK9dENgcKc9D69CjKFR5dHB7/a6ipxN9dTWbGPQQs xeZSBH1Y8pkG1wwuBHlK7ia9gs1hekKPqDzQPVrN0WNZIRXf9pmL3IT6yqCbMtxLKB09 ubXifDZgnTPwNyaczCGsMPwIM1H8ctFWpC/pF46kvzAEJqZjz5GINxqCCKUNwlhMSR5x 7iFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nmklPRcQBj3cq3CRQjPKZ1zRRLuXwz9ilMULoKUY5C4=; b=jI4IvuEy0aZ77FR9h5VrWa1mGBhQU3Wqs07wD23gZ+K/4kYh31UcmcAl+tXdpVEAhF tRuGGsv/Hrm1oaXZszaaROQOFEm/P01zBj9Pg3Qh2MxLd01Qg6ZThUztef4Uoy5jjT/d dO2G5DB0hQd2rLKRaZf26al61j3LQxbBNSHDjcuHz885pCPAH3EQZVciFbaMwRkKwOas PojZJmKCsifDGp8zkc/TlIvJBkmjZPI4JYx+DQ+zb8/X+gRbsKjVdQdqXpLgCqAbM0sh R2ihmQHMdI6CUHQfxP2hgFIbO4iqTv2SeXQXeMltbwZn5po6M91Ak+TK3K9z/4sbrGpF 6gMg== X-Gm-Message-State: AOAM533Iwt6E+URVCHooAkBcoDnGLBy0fcwFmt/YZrALmNlfyqdJS5V2 xZVjDWQ4TGEfQluM9NSI/6Pf6JOCawp5mw== X-Google-Smtp-Source: ABdhPJyJSQEweCSyXXhirx8bYNKmoxG9mjM8giNd3vvqSUwvTZZa/m4mI4DDswvT9RGXUuFMUSWiEw== X-Received: by 2002:a17:906:9d01:: with SMTP id fn1mr1907013ejc.391.1640169008808; Wed, 22 Dec 2021 02:30:08 -0800 (PST) Received: from lelap.lan (catv-80-99-178-127.catv.broadband.hu. [80.99.178.127]) by smtp.gmail.com with ESMTPSA id cs12sm601840ejc.15.2021.12.22.02.30.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 02:30:08 -0800 (PST) From: Attila Lendvai Date: Wed, 22 Dec 2021 11:28:57 +0100 Message-Id: <20211222102855.21822-2-attila@lendvai.name> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211222102855.21822-1-attila@lendvai.name> References: <20211222102855.21822-1-attila@lendvai.name> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * guix/tests/gnupg.scm (key-fingerprint-vector): New procedure. Export it. (key-fingerprint): Use it. --- guix/tests/gnupg.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/guix/tests/gnupg.scm b/guix/tests/gnupg.scm index 943fd66077..09f02a2b67 100644 --- a/guix/tests/gnupg.scm +++ b/guix/tests/gnupg.scm @@ -35,6 +35,7 @@ (define-module (guix tests gnupg) read-openpgp-packet key-fingerprint + key-fingerprint-vector key-id)) (define gpg-command @@ -82,7 +83,10 @@ (define (read-openpgp-packet file) (open-bytevector-input-port (call-with-input-file file read-radix-64)))) +(define key-fingerprint-vector + (compose openpgp-public-key-fingerprint + read-openpgp-packet)) + (define key-fingerprint (compose openpgp-format-fingerprint - openpgp-public-key-fingerprint - read-openpgp-packet)) + key-fingerprint-vector)) -- 2.34.0 From unknown Tue Jun 17 01:42:53 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Attila Lendvai Subject: bug#52722: closed (Re: bug#52722: [PATCH] tests: Smarten up git repository testing framework.) Message-ID: References: <87bl17clza.fsf_-_@gnu.org> <20211221223244.32542-1-attila@lendvai.name> X-Gnu-PR-Message: they-closed 52722 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 52722@debbugs.gnu.org Date: Thu, 23 Dec 2021 16:42:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1640277722-24466-1" This is a multi-part message in MIME format... ------------=_1640277722-24466-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #52722: [PATCH] tests: Smarten up git repository testing framework. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 52722@debbugs.gnu.org. --=20 52722: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D52722 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1640277722-24466-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 52722-done) by debbugs.gnu.org; 23 Dec 2021 16:41:40 +0000 Received: from localhost ([127.0.0.1]:34731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0R9w-0006Lu-54 for submit@debbugs.gnu.org; Thu, 23 Dec 2021 11:41:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50158) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0R9t-0006LY-4Q for 52722-done@debbugs.gnu.org; Thu, 23 Dec 2021 11:41:37 -0500 Received: from [2001:470:142:3::e] (port=60734 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0R9n-0004WY-M8; Thu, 23 Dec 2021 11:41:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=I1gbxT9CNXcrfA9Rpoavt6IbGaIA0RG7yMwKSe2LZS4=; b=d/c629sMQKr7g8nMdz/b VjqDokhJnGitc1dqeDJVHVD6GG43G85NVqPgqRjAYGMKUrQptULEeBp8vux0x248IxRKCzt2ISTqT i1DLMifAUrqIoHC7wRTzUcuizK0yspxbz4Y+SfWl+/9BjUQq/+D2Fj/YyBOfRq5N/7v+ZMmVLgusD tPUmVrjBTqcna2NQYzDfdK2YfjMHfECE6HKc+E+RVUnX3tVjgOeNtA+hREfgOTamnsiLmnxx5Ezb8 oWZRbhLHKOTBum0+lQTNHVhbO5Bu/GCh6FLGj6ryQRdmjh4GHG16OGDO7NY34VDFg97Pc/JLj8gNe cb3ZplWWtJGIHQ==; Received: from [2a01:cb18:832e:5f00:3563:417e:2a38:86d8] (port=49294 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0R9n-00062R-Nm; Thu, 23 Dec 2021 11:41:31 -0500 From: Mathieu Othacehe To: Attila Lendvai Subject: Re: bug#52722: [PATCH] tests: Smarten up git repository testing framework. References: <20211222102855.21822-1-attila@lendvai.name> <20211222102855.21822-2-attila@lendvai.name> Date: Thu, 23 Dec 2021 17:41:29 +0100 In-Reply-To: <20211222102855.21822-2-attila@lendvai.name> (Attila Lendvai's message of "Wed, 22 Dec 2021 11:28:57 +0100") Message-ID: <87bl17clza.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 52722-done Cc: 52722-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > * guix/tests/gnupg.scm (key-fingerprint-vector): New procedure. Export it. > (key-fingerprint): Use it. Pushed, thanks! Mathieu ------------=_1640277722-24466-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 21 Dec 2021 22:34:06 +0000 Received: from localhost ([127.0.0.1]:55956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznhu-0007bm-81 for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:34:06 -0500 Received: from lists.gnu.org ([209.51.188.17]:33008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznhm-0007b4-MB for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:34:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mznhm-00041U-GM for guix-patches@gnu.org; Tue, 21 Dec 2021 17:33:58 -0500 Received: from [2a00:1450:4864:20::530] (port=38911 helo=mail-ed1-x530.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mznhk-0000AC-V8 for guix-patches@gnu.org; Tue, 21 Dec 2021 17:33:58 -0500 Received: by mail-ed1-x530.google.com with SMTP id bm14so907089edb.5 for ; Tue, 21 Dec 2021 14:33:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0OcdR6vQRTSjCkc3U8/XeIuW9iwDx50UOXa8hQoarjM=; b=jd0vw19AhrQkVaDh5WfgPFMdmmJlbliZaEAER/4nQVpE7WkAsGgSD5hhlEbO16wEeA n14FOw+J4h8Mr4EDp0aVdKM9E9MiAu+QORxOT0LLPvQ4g3+CH7zpGOosCwSuaUnZwjVm ag+w0RfK76B12wlYwdfzA3j2bHD8klHvB1PCPMIW2AGbG8MVrO41o2hMmczrz3jpmJUI h4nmgvSUjNf8LUVYLbRfGo6EuH02OtuxPbGJeYNgEXNKnrhLBjVyH4031kulANCDOrlu wLRGMM+RoVKOqbDcXCV8wD67tMDyY7Sajm7joyeHHeBU9/RPMP/UDi/9JlWyCH9JlWfZ cs4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=0OcdR6vQRTSjCkc3U8/XeIuW9iwDx50UOXa8hQoarjM=; b=4174SUHZisn8WBMIhX3msauVSTWF1KL9aC0VAFlZIzs2tqL/D37UVogSmHrD3YcxgG rOGe7e65k0mm7fbHGuX1clQM88MoYRpLwWiB+0CPFby/V+PjdV07GhUw8/gzheA5Tb95 WoxZcfPQaA2pwAml6T0Ngw8jEyLteKcSOUqJYClVRc/jRlDyYmuIsdp6pglZQF9qTx6I 7yzWPNvsllemaBsWFtrRKScVDo0GT681LPkiQH/DljUJR0c3cbEW2m+RoWhSRFmRalgz quErAWk+LjIhcqirxzPy35XO5nZgmCz4e907f2ro6VoWSPyeScVF7F8ZEhbfyQsoIVzr d2gQ== X-Gm-Message-State: AOAM5312ypHYKAdPeayhdXTnn447u8cqmfvq+Y3aBJO34V3qIppf1dLj /h4HXmkGonIrYCVJNpgk64oW1nbaHQgLQQ== X-Google-Smtp-Source: ABdhPJwZun8rbrlsGSzGdrkry/FbCSTeh/JT4gWvuYJP08nX+Y+EL5k9rekFIJWq7VDvi8UmYxBBOQ== X-Received: by 2002:a17:906:649c:: with SMTP id e28mr337341ejm.60.1640126025854; Tue, 21 Dec 2021 14:33:45 -0800 (PST) Received: from localhost.localdomain ([2a02:ab88:3700:b180:6072:12a9:8472:9a8f]) by smtp.gmail.com with ESMTPSA id hq29sm54462ejc.141.2021.12.21.14.33.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 14:33:45 -0800 (PST) From: Attila Lendvai To: guix-patches@gnu.org Subject: [PATCH] tests: Smarten up git repository testing framework. Date: Tue, 21 Dec 2021 23:32:41 +0100 Message-Id: <20211221223244.32542-1-attila@lendvai.name> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::530 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=attila.lendvai@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.8 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: These features will be used in upcoming tests. * guix/tests/git.scm (with-git-repository): New macro that can be used multiple times, inside a with-temporary-git-repository. (populate-git-repository): Extend the DSL with (add "some-noise"), (reset [...] Content analysis details: (1.8 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.51.188.17 listed in wl.mailspike.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (attila.lendvai[at]gmail.com) 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 T_SPF_TEMPERROR SPF: test of record failed (temperror) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different 1.3 SPOOFED_FREEMAIL No description available. X-Debbugs-Envelope-To: submit Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.9 (-) These features will be used in upcoming tests. * guix/tests/git.scm (with-git-repository): New macro that can be used multiple times, inside a with-temporary-git-repository. (populate-git-repository): Extend the DSL with (add "some-noise"), (reset "[commit hash]"), (checkout "branch" orphan). * guix/tests/gnupg.scm (key-fingerprint-vector): New procedure. --- guix/tests/git.scm | 23 +++++++++++++++++++++-- guix/tests/gnupg.scm | 8 ++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/guix/tests/git.scm b/guix/tests/git.scm index 69960284d9..76f5a8b937 100644 --- a/guix/tests/git.scm +++ b/guix/tests/git.scm @@ -26,6 +26,7 @@ (define-module (guix tests git) #:use-module (ice-9 control) #:export (git-command with-temporary-git-repository + with-git-repository find-commit)) (define git-command @@ -59,8 +60,9 @@ (define (git command . args) (apply invoke (git-command) "-C" directory command args))))) - (mkdir-p directory) - (git "init") + (unless (directory-exists? (string-append directory "/.git")) + (mkdir-p directory) + (git "init")) (let loop ((directives directives)) (match directives @@ -78,6 +80,9 @@ (define (git command . args) port))) (git "add" file) (loop rest))) + ((('add file-name-and-content) rest ...) + (loop (cons `(add ,file-name-and-content ,file-name-and-content) + rest))) ((('remove file) rest ...) (git "rm" "-f" file) (loop rest)) @@ -99,12 +104,18 @@ (define (git command . args) ((('checkout branch) rest ...) (git "checkout" branch) (loop rest)) + ((('checkout branch 'orphan) rest ...) + (git "checkout" "--orphan" branch) + (loop rest)) ((('merge branch message) rest ...) (git "merge" branch "-m" message) (loop rest)) ((('merge branch message ('signer fingerprint)) rest ...) (git "merge" branch "-m" message (string-append "--gpg-sign=" fingerprint)) + (loop rest)) + ((('reset to) rest ...) + (git "reset" "--hard" to) (loop rest))))) (define (call-with-temporary-git-repository directives proc) @@ -121,6 +132,14 @@ (define-syntax-rule (with-temporary-git-repository directory (lambda (directory) exp ...))) +(define-syntax-rule (with-git-repository directory + directives exp ...) + "Evaluate EXP in a context where DIRECTORY is (further) populated as +per DIRECTIVES." + (begin + (populate-git-repository directory directives) + exp ...)) + (define (find-commit repository message) "Return the commit in REPOSITORY whose message includes MESSAGE, a string." (let/ec return diff --git a/guix/tests/gnupg.scm b/guix/tests/gnupg.scm index 943fd66077..09f02a2b67 100644 --- a/guix/tests/gnupg.scm +++ b/guix/tests/gnupg.scm @@ -35,6 +35,7 @@ (define-module (guix tests gnupg) read-openpgp-packet key-fingerprint + key-fingerprint-vector key-id)) (define gpg-command @@ -82,7 +83,10 @@ (define (read-openpgp-packet file) (open-bytevector-input-port (call-with-input-file file read-radix-64)))) +(define key-fingerprint-vector + (compose openpgp-public-key-fingerprint + read-openpgp-packet)) + (define key-fingerprint (compose openpgp-format-fingerprint - openpgp-public-key-fingerprint - read-openpgp-packet)) + key-fingerprint-vector)) -- 2.34.0 ------------=_1640277722-24466-1-- From unknown Tue Jun 17 01:42:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#52722] [PATCH v2 1/2] tests: Smarten up git repository testing framework. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Dec 2021 17:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52722 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Attila Lendvai Cc: 52722@debbugs.gnu.org Received: via spool by 52722-submit@debbugs.gnu.org id=B52722.164028124930416 (code B ref 52722); Thu, 23 Dec 2021 17:41:01 +0000 Received: (at 52722) by debbugs.gnu.org; 23 Dec 2021 17:40:49 +0000 Received: from localhost ([127.0.0.1]:34834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0S5A-0007uV-Mb for submit@debbugs.gnu.org; Thu, 23 Dec 2021 12:40:48 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:42765) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0S58-0007uI-6t for 52722@debbugs.gnu.org; Thu, 23 Dec 2021 12:40:46 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 65B033200BF9; Thu, 23 Dec 2021 12:40:40 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 23 Dec 2021 12:40:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=BRVErz8pv6KfmHhaePv/ZyBb i1RTrunEiQEchvyUMhA=; b=XvSL1k/eGnFBoS0AfyfI0u72qmbRAkiWoUmQirVp aQH1rmdFB8GCM7WEIESKGhl2ai5OhfpUaGn/boY1//OEj93IeCHbegGcPxjn4nwi vzIAqRLRMBveOTSPCSLUiMEuaf4NEmv7W1dJR2TiVE4ZNJeNUfdYBvMAkXyhFHHb NkE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=BRVErz 8pv6KfmHhaePv/ZyBbi1RTrunEiQEchvyUMhA=; b=fzifBJ7zWRZDDjHLxFD2rh 7IjkRdeK0I+X5cEhX/Hb6UqWo4hYba2LfImQKoVCmlHmNzYm00NaBplZX3mtwpRf S8DMTWHAvjbx1ivQ6WtxvAJdIO2qJqk/sUnRMpaZqpK2wmf8+C1FT0+FrfRMMocI j+FtVNY2kno5BoQjuncQdbfAVxSVjH0Pomla7KgjFY4lRLNpV7sLNwvBnAgwm1cY nmdGlcb26XfVK5r51IMtW7sEhCu6vDVigGpkwa1cAPZCAUBcFkHRb1KjapNoF8UF ruMZOVP6LjE2a3ynTu3lf2DHLH943J34oJ4LdMU90odsay4TYfyLkpaWnPLv7yLw == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddtkedguddtfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepnfgvohcu hfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrth htvghrnhepueekkedtffdvtddugeejgedtvefhueefiedvjeeitdeigedtveejvdejheff vefgnecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehmrghilhhfrhhomheplh gvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 23 Dec 2021 12:40:39 -0500 (EST) Date: Thu, 23 Dec 2021 12:40:38 -0500 From: Leo Famulari Message-ID: References: <20211221223244.32542-1-attila@lendvai.name> <20211222102855.21822-1-attila@lendvai.name> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211222102855.21822-1-attila@lendvai.name> X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Wed, Dec 22, 2021 at 11:28:55AM +0100, Attila Lendvai wrote: > * guix/tests/git.scm (with-git-repository): New macro, exported. It can be used > repeatedly inside a WITH-TEMPORARY-GIT-REPOSITORY. > (populate-git-repository): Extend the DSL with (ADD "some-noise"), (RESET > "[commit hash]"), (CHECKOUT "branch" ORPHAN). This commit introduced some ambiguity while importing the RESET procedure: WARNING: (guix tests git): `reset' imported from both (git) and (ice-9 control) We need to make sure that the correct reset is imported here. Can you take a look and make any adjustments, if necessary? From unknown Tue Jun 17 01:42:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#52722] [PATCH v2 1/2] tests: Smarten up git repository testing framework. Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Dec 2021 21:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52722 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: 52722@debbugs.gnu.org Reply-To: Attila Lendvai Received: via spool by 52722-submit@debbugs.gnu.org id=B52722.164029322025401 (code B ref 52722); Thu, 23 Dec 2021 21:01:01 +0000 Received: (at 52722) by debbugs.gnu.org; 23 Dec 2021 21:00:20 +0000 Received: from localhost ([127.0.0.1]:35038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0VCF-0006bd-V0 for submit@debbugs.gnu.org; Thu, 23 Dec 2021 16:00:20 -0500 Received: from mail-4018.proton.ch ([185.70.40.18]:50663) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0VCD-0006bQ-Lu for 52722@debbugs.gnu.org; Thu, 23 Dec 2021 16:00:19 -0500 Date: Thu, 23 Dec 2021 21:00:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lendvai.name; s=protonmail3; t=1640293210; bh=zpC+pEvAtsLRNxZIuUGR0FcWLdOpvtX+yP8kq4Fajtw=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:From:To:Cc; b=de5QsmH23hDJ0w5F5170SgAtDNTR4s0WkFc0NlQc4X5SfBIwgihn5ZYKNcc92UkFX HfMiKi7d0p2g2RR3XN9s+YNm/B/t1E9eF1REJxlYRKVptTbbuBXtK9aS1hWuWDUR44 xfglU2FfNC4zl4ajiVfSIDXZ21FnOUHtfBVmS/0k0I389D36A7VWqFav9VoYmV4Dng 1VycvRumaWgAyAMZBfp0YEIHHQfviocLqr2DvDZ2k2Yv2I7TZz1mzlA0ayh9RoTqxF ErC6ca4kZ0wRe8wixwBdDIwTF8HL5BBA/BbuviqJrNVE3s15V6DI/1uOTpxhNu4KQO 1CShBnK/YQPgA== From: Attila Lendvai Message-ID: <-1PF3BR6MNJyF-1HwyBikuI03CzRN92E6OE0b-MNHyXeG3NUkaHGrKg_55ORoS6-_0FBO3uZgSQNQZH1o0xnl9eWpQ3gmc2joO5VgTSNSuw=@lendvai.name> In-Reply-To: References: <20211221223244.32542-1-attila@lendvai.name> <20211222102855.21822-1-attila@lendvai.name> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > WARNING: (guix tests git): `reset' imported from both (git) and (ice-9 co= ntrol) > > We need to make sure that the correct reset is imported here. Can you > take a look and make any adjustments, if necessary? i wonder why that is only a warning and not a full error. but anyway, the fix is to only import let/ec. please change the relevant line to: #:use-module ((ice-9 control) #:select (let/ec)) can you please commit this without going through the full patch-submission cycle? - attila From unknown Tue Jun 17 01:42:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#52722] [PATCH v2 1/2] tests: Smarten up git repository testing framework. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Dec 2021 23:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52722 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Attila Lendvai Cc: 52722@debbugs.gnu.org Received: via spool by 52722-submit@debbugs.gnu.org id=B52722.164030339526239 (code B ref 52722); Thu, 23 Dec 2021 23:50:01 +0000 Received: (at 52722) by debbugs.gnu.org; 23 Dec 2021 23:49:55 +0000 Received: from localhost ([127.0.0.1]:35224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0XqN-0006p9-0w for submit@debbugs.gnu.org; Thu, 23 Dec 2021 18:49:55 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:57353) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0XqL-0006ov-No for 52722@debbugs.gnu.org; Thu, 23 Dec 2021 18:49:54 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 56A433201C92; Thu, 23 Dec 2021 18:49:47 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 23 Dec 2021 18:49:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=0mIaV2UERShSClE4IpNimLIu lKHgelMNyU9iqwWgPTk=; b=Q4P08FapfqqgTD8tF1gltkHPKtqR8A8dYhwBK1NJ nkfL3BlnP13rhmu7rAqgiXK0eIiUXwb+VZKjUNutgzKKjlPrvZ/sU46MkJJK2x0D KhNObYQIv1dDLltjZPbnzu0/P3ogB+vGMtQOKtfEfVfCDIVCoDalYUPakA9lig91 79s= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=0mIaV2 UERShSClE4IpNimLIulKHgelMNyU9iqwWgPTk=; b=T2iP/+7C62wjvkKdIoL/uZ cuqG9QEjXrnbGXD3ohwFgp5/tKZ8Z8oNQIQg/RhN3AtYuAZSQSM0scJfh34U77ou jpv4bmUGv4RyV9TySKKC8Fp+Bw1lCpWzZt6UvhroalL8/DCOxZrgOv7vt8+rZ2Ib Qe4a1+7gyb/X6xAGQKKKVuuugchuftJtPFaG+8gUUWtiI8zFYJ5xq7CZn6qbHsd2 NzkD2NQ6QviZ8CMsmdk1YlXmT/WsShI8YOL9RlZ8QVJx7kexigprnVTbY6XbgpHE YVAc5Ry8b0/aE+dmpiMzenZDqm9qQhV6pjZgk9PlQ0mFPC1MCWv/xCj/6nlqtpOw == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddtledgtdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefnvghoucfh rghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtth gvrhhnpeeukeektdffvddtudegjeegtdevhfeufeeivdejiedtieegtdevjedvjeehffev gfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvg hosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 23 Dec 2021 18:49:46 -0500 (EST) Date: Thu, 23 Dec 2021 18:49:38 -0500 From: Leo Famulari Message-ID: References: <20211221223244.32542-1-attila@lendvai.name> <20211222102855.21822-1-attila@lendvai.name> <-1PF3BR6MNJyF-1HwyBikuI03CzRN92E6OE0b-MNHyXeG3NUkaHGrKg_55ORoS6-_0FBO3uZgSQNQZH1o0xnl9eWpQ3gmc2joO5VgTSNSuw=@lendvai.name> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <-1PF3BR6MNJyF-1HwyBikuI03CzRN92E6OE0b-MNHyXeG3NUkaHGrKg_55ORoS6-_0FBO3uZgSQNQZH1o0xnl9eWpQ3gmc2joO5VgTSNSuw=@lendvai.name> X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Thu, Dec 23, 2021 at 09:00:10PM +0000, Attila Lendvai wrote: > > WARNING: (guix tests git): `reset' imported from both (git) and (ice-9 control) > > > > We need to make sure that the correct reset is imported here. Can you > > take a look and make any adjustments, if necessary? > > i wonder why that is only a warning and not a full error. > > but anyway, the fix is to only import let/ec. please change the > relevant line to: > > #:use-module ((ice-9 control) #:select (let/ec)) > > can you please commit this without going through the full > patch-submission cycle? Sure, done as commit ba744faeb104a1132d9f6ed04fc296b23bc09334