From patchwork Fri Sep 17 08:04:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 33085 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 292A727BBE3; Fri, 17 Sep 2021 09:05:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D360927BBE1 for ; Fri, 17 Sep 2021 09:05:51 +0100 (BST) Received: from localhost ([::1]:45960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mR8sY-0003eS-Oi for patchwork@mira.cbaines.net; Fri, 17 Sep 2021 04:05:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mR8rn-0003c4-IO for guix-patches@gnu.org; Fri, 17 Sep 2021 04:05:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mR8rn-0007k8-3A for guix-patches@gnu.org; Fri, 17 Sep 2021 04:05:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mR8rm-0001Lq-TR for guix-patches@gnu.org; Fri, 17 Sep 2021 04:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50359] [PATCH v3 2/3] tests: git: Make 'tag' directive non-interactive. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Sep 2021 08:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50359 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50359@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Sarah Morgensen Received: via spool by 50359-submit@debbugs.gnu.org id=B50359.16318658945148 (code B ref 50359); Fri, 17 Sep 2021 08:05:02 +0000 Received: (at 50359) by debbugs.gnu.org; 17 Sep 2021 08:04:54 +0000 Received: from localhost ([127.0.0.1]:58400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mR8rd-0001Ky-PB for submit@debbugs.gnu.org; Fri, 17 Sep 2021 04:04:53 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:60992 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mR8rb-0001Kg-TB for 50359@debbugs.gnu.org; Fri, 17 Sep 2021 04:04:52 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1631865884; bh=vyyOjLmJdXrHvS8lKxM+aYMGF8KOAjIWUtn+DFvdEf4=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=gGBDxFDrNV/CIMLHSKvPoP2sk2y0NT8XkTWvlXD6JspoKffVe0K8ryclt1qsoc+B+ VHT51w56RmOf8y8vK4578zUfjTXscwNicUjB6JTcPP6zW6OOZ0STX8hRjVf0v+kwfj 8lIK8PZx8xlQWGGJ8wvSYJBzURDdc4OoKmj782GI= In-Reply-To: References: Message-Id: Date: Fri, 17 Sep 2021 10:04:44 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches When running 'git tag TAGNAME', Git will open up the user's default text editor to make them write a message. This is not desirable when running tests. * guix/tests/git.scm (populate-git-repository): Make the 'tag' directive take an additional argument, and pass it to the '-m' flag. * tests/channels.scm ("channel-news, one entry"): Adjust accordingly. --- guix/tests/git.scm | 4 ++-- tests/channels.scm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/tests/git.scm b/guix/tests/git.scm index e11541e83b..e8d4946e87 100644 --- a/guix/tests/git.scm +++ b/guix/tests/git.scm @@ -87,8 +87,8 @@ Return DIRECTORY on success." ((('commit text ('signer fingerprint)) rest ...) (git "commit" "-m" text (string-append "--gpg-sign=" fingerprint)) (loop rest)) - ((('tag name) rest ...) - (git "tag" name) + ((('tag name text) rest ...) + (git "tag" "-m" text name) (loop rest)) ((('branch name) rest ...) (git "branch" name) diff --git a/tests/channels.scm b/tests/channels.scm index 0264369d9e..8f7ff1e7a8 100644 --- a/tests/channels.scm +++ b/tests/channels.scm @@ -329,7 +329,7 @@ (commit "first commit") (add "src/a.txt" "A") (commit "second commit") - (tag "tag-for-first-news-entry") + (tag "tag-for-first-news-entry" "First news entry!") (add "news.scm" ,(lambda (repository) (let ((previous