From patchwork Wed Jan 15 22:14:48 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: 37080 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 39BB027BBEA; Wed, 15 Jan 2025 22:16:21 +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 ED7EE27BBE2 for ; Wed, 15 Jan 2025 22:16:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYBgC-0003e2-SK; Wed, 15 Jan 2025 17:16:04 -0500 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 1tYBgB-0003d7-2q for guix-patches@gnu.org; Wed, 15 Jan 2025 17:16:03 -0500 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 1tYBgA-0004IU-Qi for guix-patches@gnu.org; Wed, 15 Jan 2025 17:16:02 -0500 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=JMTiwgJyG2Yl+3Y/gtJm+iaI0vT9Pc+7ZIgV+MplzE4=; b=P6vYWCwlq0y891LEiy2LhdprSOwswASpHKY4gzdo2l26l154eMlJNDELDxEzZNBkQbfxZ4REmvgipE8ymi/vDsNU1ENKBr3kKQDv4qXcnVePC7YepVzzCGnsPeQWRzu9ozbrha68irfSKiuT65C2pT+Xjd5EisGBE6I2DuaQEg9Q+nJhgmo2T6Yy1DYA0zPOWen6DNzmo+LtIuqGEfaNElNRgBjEAlANsN+IlW87++Iovfxyfc5os08TnagKYhrM+j+QfnRS9hQvfFptMZNCnv/UX/mbUlHDWYa00QV/KvCq55bDjhAW07tFgZn5rLPeqAEPhbJQCG3A9iYCABx1sg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tYBgA-0002tm-Ke for guix-patches@gnu.org; Wed, 15 Jan 2025 17:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75595] [PATCH 2/4] tests: Make =?utf-8?b?4oCYaW5mZXJpb3ItZXZh?= =?utf-8?b?bC13aXRoLXN0b3Jl4oCZ?= test more robust. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Jan 2025 22:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75595 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75595@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 75595-submit@debbugs.gnu.org id=B75595.173697930810935 (code B ref 75595); Wed, 15 Jan 2025 22:16:02 +0000 Received: (at 75595) by debbugs.gnu.org; 15 Jan 2025 22:15:08 +0000 Received: from localhost ([127.0.0.1]:59075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tYBfH-0002pj-Aj for submit@debbugs.gnu.org; Wed, 15 Jan 2025 17:15:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60080) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tYBfE-0002lF-IP for 75595@debbugs.gnu.org; Wed, 15 Jan 2025 17:15:04 -0500 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 1tYBf9-00042F-9m; Wed, 15 Jan 2025 17:14:59 -0500 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=JMTiwgJyG2Yl+3Y/gtJm+iaI0vT9Pc+7ZIgV+MplzE4=; b=kfT6Z5dpgfs/zpFQGhmE llzTLyQksJ1RQj82n2sPXDaAyon4PsaDI447aB4EB4gM8p8GMNUHnpV7n1ms6iVuU9i6LRtxGs7O9 +XXrZQuGqn2olPBeb/8+ifQ8uqUk++7WR+d0/VjjkyyY+Awj28ocTMfCaHPOS1+G6XbTxlOHkU/oO +7n1943O6cSbuzDbJtR4XCbeOOLBhqb5FJowysReXiXkvaeen9SEqaeAE9SDHE7NVAHvayKc4b1HK Hio5kbgYymLrlAuaWkqRDy8kDLVTzclyzHjYfIXUWl8oPMKXaGlBVf6iXxnq5Aatfo+cJfv/mQVjD db9gvbIfu8/PrA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 15 Jan 2025 23:14:48 +0100 Message-ID: X-Mailer: git-send-email 2.47.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 * tests/inferior.scm ("inferior-eval-with-store"): Use ‘random-text’ for the store item’s body. Change-Id: Ia39e276955e1836a0272713ff25c4490273c666f --- tests/inferior.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/inferior.scm b/tests/inferior.scm index 963d405e33..11a27c0006 100644 --- a/tests/inferior.scm +++ b/tests/inferior.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018-2022 Ludovic Courtès +;;; Copyright © 2018-2022, 2025 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +27,8 @@ (define-module (test-inferior) #:use-module (gnu packages bootstrap) #:use-module (gnu packages guile) #:use-module (gnu packages sqlite) + #:autoload (gcrypt hash) (sha256) + #:autoload (rnrs bytevectors) (string->utf8) #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) #:use-module (srfi srfi-64) @@ -220,14 +222,15 @@ (define (manifest-entry->list entry) (close-inferior inferior) result)) -(test-equal "inferior-eval-with-store" - (add-text-to-store %store "foo" "Hello, world!") +(test-assert "inferior-eval-with-store" (let* ((inferior (open-inferior %top-builddir - #:command "scripts/guix"))) - (inferior-eval-with-store inferior %store - '(lambda (store) - (add-text-to-store store "foo" - "Hello, world!"))))) + #:command "scripts/guix")) + (text (random-text))) + (string=? (inferior-eval-with-store inferior %store + `(lambda (store) + (add-text-to-store store "foo" + ,text))) + (store-path "text" (sha256 (string->utf8 text)) "foo")))) (test-assert "inferior-eval-with-store, &store-protocol-error" (let* ((inferior (open-inferior %top-builddir