From patchwork Tue Dec 21 14:23:37 2021 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: 35518 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 C5D1527BBE9; Tue, 21 Dec 2021 14:24:37 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 C1FF927BBEC for ; Tue, 21 Dec 2021 14:24:32 +0000 (GMT) Received: from localhost ([::1]:46850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzg48-0003DN-0L for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 09:24:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzg3s-00037w-3R for guix-patches@gnu.org; Tue, 21 Dec 2021 09:24:17 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41263) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzg3e-0000cc-KQ for guix-patches@gnu.org; Tue, 21 Dec 2021 09:24:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzg3e-0005eS-Hf for guix-patches@gnu.org; Tue, 21 Dec 2021 09:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52703] [PATCH 2/2] tests: rsync: Define several modules. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 14:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52703 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52703@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 52703-submit@debbugs.gnu.org id=B52703.164009663921708 (code B ref 52703); Tue, 21 Dec 2021 14:24:02 +0000 Received: (at 52703) by debbugs.gnu.org; 21 Dec 2021 14:23:59 +0000 Received: from localhost ([127.0.0.1]:52807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzg3b-0005e3-5g for submit@debbugs.gnu.org; Tue, 21 Dec 2021 09:23:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzg3Z-0005dg-J3 for 52703@debbugs.gnu.org; Tue, 21 Dec 2021 09:23:58 -0500 Received: from [2001:470:142:3::e] (port=50924 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 1mzg3O-0000bK-Ug; Tue, 21 Dec 2021 09:23:51 -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=pWJMfJJ2A6WOmuIGTv0vCLWwEYHMzg/AOLAvZUQ2Raw=; b=lSs+Ti1U202ee9fOAce5 qTAFj4u0BHsLM1eBoabZgrcCdl8rCnH2YlqOMr+93EjT1ByVBS933mb0y3V7x/pGAJjhMa0pPmtQs SElUXUcu4ewllL/YA9othirHePxt5yxjTCWO28/SxyUTL3Msc4085Vq4R5TSY6sMyokpx/wNcfpyS Rvy9GoOPix1N4GOJvqzglGuRPxkTAwTphewuSj3zVpQorDB4Tdsi+CNll6s9ksKcZXG1R+vmCVBpF s7ydr7ttNv1FrWpOCkc5+CRrms7n4Rk6IhD6bOQBDD0hoxXNfHf9WgDhfOzbkor8eDlLkkIPZdXXz s+3kNItfSZ+IeQ==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=35168 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzg3O-00066P-6h; Tue, 21 Dec 2021 09:23:46 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 21 Dec 2021 15:23:37 +0100 Message-Id: <20211221142337.3811-2-ludo@gnu.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211221142337.3811-1-ludo@gnu.org> References: <20211221142337.3811-1-ludo@gnu.org> 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 * gnu/tests/rsync.scm (run-rsync-test)["Test file not copied to read-only share", "Test file correctly received from read-only share"]: New tests. (%rsync-os): Define two modules. --- gnu/tests/rsync.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/gnu/tests/rsync.scm b/gnu/tests/rsync.scm index 91f2b41cec..079a898cdc 100644 --- a/gnu/tests/rsync.scm +++ b/gnu/tests/rsync.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2021 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,6 +105,35 @@ (define marionette (read-line port)))) marionette)) + (test-equal "Test file not copied to read-only share" + 10 ;see "EXIT VALUES" in rsync(1) + (marionette-eval + '(status:exit-val + (system* "rsync" "/tmp/input" + (string-append "rsync://localhost:" + (number->string #$rsync-port) + "/read-only/input"))) + marionette)) + + (test-equal "Test file correctly received from read-only share" + "\"Hi!\" from the read-only share." + (marionette-eval + '(begin + (use-modules (ice-9 rdelim)) + + (call-with-output-file "/srv/read-only/the-file" + (lambda (port) + (display "\"Hi!\" from the read-only share." port))) + + (zero? + (system* "rsync" + (string-append "rsync://localhost:" + (number->string #$rsync-port) + "/read-only/the-file") + "/tmp/output")) + (call-with-input-file "/tmp/output" read-line)) + marionette)) + (test-end)))) (gexp->derivation "rsync-test" test)) @@ -113,7 +143,15 @@ (define* %rsync-os (let ((base-os (simple-operating-system (service dhcp-client-service-type) - (service rsync-service-type)))) + (service rsync-service-type + (rsync-configuration + (modules (list (rsync-module + (name "read-only") + (file-name "/srv/read-only")) + (rsync-module + (name "files") + (file-name "/srv/read-write") + (read-only? #f))))))))) (operating-system (inherit base-os) (packages (cons* rsync