From patchwork Sat Mar 22 11:36:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 40596 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 F09E727BBEA; Sat, 22 Mar 2025 11:38:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7C53027BBE2 for ; Sat, 22 Mar 2025 11:38:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvxBM-00024P-O5; Sat, 22 Mar 2025 07:38:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvxB0-0001m4-TB for guix-patches@gnu.org; Sat, 22 Mar 2025 07:38:07 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tvxB0-00007J-4G for guix-patches@gnu.org; Sat, 22 Mar 2025 07:38:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ASZ5k0dIb4ZYdG0mMlz81k+mQPqwvtTufBnDwD19o1Y=; b=NF3va2V069sg6lkQNiu5uKP7Vfm3p9DlxMeN2XDA6nupARkYwF2gUIAOHY/7RBHJSCbIGnMUhG/Nlxu8b0wNH7z9Jdt9LgbDoSV5xe84S8g5B8RyX74LwM9Y3P530LA/aZ4UmwP2aHyXbX5RTrdmMYegpvHNmzm4iOFShtfJdHNlA0xEc0VeTUJOpalF4cwSOhLRaON6GTfTGpNjslpgXHhwgYuyffbAmBgQoTDCLfHIN5xvJALAnSVPLdlKrbC5xjLBUvxW/tXPFZT1i5zMd3mbgqMvdss1rUCNtOj4UwHtYyFJK8L6BArifn/HkYyrtlwquciLpYGWmyTUuHKAHA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tvxAz-0002ZG-Vv for guix-patches@gnu.org; Sat, 22 Mar 2025 07:38:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77041] [PATCH v2 09/16] tests: ganeti: Remove unnecessary =?utf-8?b?4oCYYmVnaW7igJku?= Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 11:38:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77041 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77041@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 77041-submit@debbugs.gnu.org id=B77041.17426434669722 (code B ref 77041); Sat, 22 Mar 2025 11:38:05 +0000 Received: (at 77041) by debbugs.gnu.org; 22 Mar 2025 11:37:46 +0000 Received: from localhost ([127.0.0.1]:41189 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tvxAf-0002Wi-UM for submit@debbugs.gnu.org; Sat, 22 Mar 2025 07:37:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44774) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tvxAT-0002Uc-9p for 77041@debbugs.gnu.org; Sat, 22 Mar 2025 07:37:33 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tvxAO-0008UU-0J; Sat, 22 Mar 2025 07:37:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=ASZ5k0dIb4ZYdG0mMlz81k+mQPqwvtTufBnDwD19o1Y=; b=KKPz6NolyhO1eh1Khojp NpriUNVng1w5xySP9QyCSX6Ix6GTv1xuErPwvU8CEJGKaDV8UPcXS+cDzdJn5pdtkcOiUkJ9Y+rGp Q2wlodkRZSaELXStvz3JGtQfAXJDz0mfiEgjU/I5dyVIOTcYFVVWfM/vDqcpePmM2wu+ps6KbS+gB hULisgTPf1fPaEdnztNT+9A8skA0WV6rBieYZFGDiaJbjZ69ALr81t6SBR2vaF3UsqA9YAlBshYQd IqE/gRe75Lm9MxVXbf0UkNrIymytd6aDyUlVxHm1ICal1NlPa1uj7e6ZXWXHg3nbhrgek4FSsT6Uz dhRMzt5L1MGugQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sat, 22 Mar 2025 12:36:46 +0100 Message-ID: <3a213dd818bf1bbd1a302162de8c2625fbfea96f.1742642743.git.ludo@gnu.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/tests/ganeti.scm (run-ganeti-test): Remove ‘begin’ where unnecessary. Change-Id: I3a36fffdc797c9187b5ffa406f7a06985f18d29c --- gnu/tests/ganeti.scm | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/gnu/tests/ganeti.scm b/gnu/tests/ganeti.scm index 29eb354044..ce55c8e04f 100644 --- a/gnu/tests/ganeti.scm +++ b/gnu/tests/ganeti.scm @@ -154,9 +154,8 @@ (define* (run-ganeti-test hypervisor #:key (test-eq "watcher pause" 0 (marionette-eval - '(begin - (system* #$(file-append ganeti "/sbin/gnt-cluster") - "watcher" "pause" "1h")) + '(system* #$(file-append ganeti "/sbin/gnt-cluster") + "watcher" "pause" "1h") marionette)) (test-assert "force-start wconfd" @@ -174,8 +173,7 @@ (define* (run-ganeti-test hypervisor #:key (test-eq "gnt-cluster verify 1" 0 (marionette-eval - '(begin - (system* #$(file-append ganeti "/sbin/gnt-cluster") "verify")) + '(system* #$(file-append ganeti "/sbin/gnt-cluster") "verify") marionette)) ;; Try stopping and starting daemons with daemon-util like @@ -183,33 +181,29 @@ (define* (run-ganeti-test hypervisor #:key (test-eq "daemon-util stop-all" 0 (marionette-eval - '(begin - (system* #$(file-append ganeti "/lib/ganeti/daemon-util") - "stop-all")) + '(system* #$(file-append ganeti "/lib/ganeti/daemon-util") + "stop-all") marionette)) (test-eq "daemon-util start-all" 0 (marionette-eval - '(begin - (system* #$(file-append ganeti "/lib/ganeti/daemon-util") - "start-all")) + '(system* #$(file-append ganeti "/lib/ganeti/daemon-util") + "start-all") marionette)) ;; Check that the cluster is still healthy after the daemon restarts. (test-eq "gnt-cluster verify 2" 0 (marionette-eval - '(begin - (system* #$(file-append ganeti "/sbin/gnt-cluster") "verify")) + '(system* #$(file-append ganeti "/sbin/gnt-cluster") "verify") marionette)) (test-eq "watcher continue" 0 (marionette-eval - '(begin - (system* #$(file-append ganeti "/sbin/gnt-cluster") - "watcher" "continue")) + '(system* #$(file-append ganeti "/sbin/gnt-cluster") + "watcher" "continue") marionette)) ;; Try accessing the RAPI. @@ -244,9 +238,8 @@ (define* (run-ganeti-test hypervisor #:key (test-eq "gnt-cluster destroy" 0 (marionette-eval - '(begin - (system* #$(file-append ganeti "/sbin/gnt-cluster") - "destroy" "--yes-do-it")) + '(system* #$(file-append ganeti "/sbin/gnt-cluster") + "destroy" "--yes-do-it") marionette)) (test-end))))