From patchwork Tue Dec 3 12:46:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Vollmert X-Patchwork-Id: 16353 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 CEB9517831; Tue, 3 Dec 2019 12:55:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 803F81782E for ; Tue, 3 Dec 2019 12:55:15 +0000 (GMT) Received: from localhost ([::1]:52926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ic7hx-0004Rl-2J for patchwork@mira.cbaines.net; Tue, 03 Dec 2019 07:55:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53306) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ic7c4-0002f1-TI for guix-patches@gnu.org; Tue, 03 Dec 2019 07:49:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ic7c2-0001L3-F0 for guix-patches@gnu.org; Tue, 03 Dec 2019 07:49:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33409) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ic7bz-0001If-Ix for guix-patches@gnu.org; Tue, 03 Dec 2019 07:49:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ic7by-0002cN-Gn for guix-patches@gnu.org; Tue, 03 Dec 2019 07:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38429] [PATCH 4/5] scron: add system test Resent-From: Robert Vollmert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Dec 2019 12:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38429 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38429@debbugs.gnu.org Cc: Robert Vollmert Received: via spool by 38429-submit@debbugs.gnu.org id=B38429.157537731610014 (code B ref 38429); Tue, 03 Dec 2019 12:49:02 +0000 Received: (at 38429) by debbugs.gnu.org; 3 Dec 2019 12:48:36 +0000 Received: from localhost ([127.0.0.1]:39380 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ic7bX-0002bQ-Ps for submit@debbugs.gnu.org; Tue, 03 Dec 2019 07:48:36 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:21244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ic7bV-0002ai-RE for 38429@debbugs.gnu.org; Tue, 03 Dec 2019 07:48:34 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 47S1xQ4QNgzQlD5; Tue, 3 Dec 2019 13:48:26 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id YkE2kizTB8k9; Tue, 3 Dec 2019 13:48:23 +0100 (CET) From: Robert Vollmert Date: Tue, 3 Dec 2019 13:46:32 +0100 Message-Id: <20191203124632.1987-4-rob@vllmrt.net> In-Reply-To: <20191203124632.1987-1-rob@vllmrt.net> References: <20191203124632.1987-1-rob@vllmrt.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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/base.scm | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index a891711844..b80e77be66 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -28,6 +28,7 @@ #:use-module (gnu services dbus) #:use-module (gnu services avahi) #:use-module (gnu services mcron) + #:use-module (gnu services scron) #:use-module (gnu services shepherd) #:use-module (gnu services networking) #:use-module (gnu packages base) @@ -48,6 +49,7 @@ %test-halt %test-cleanup %test-mcron + %test-scron %test-nss-mdns)) (define %simple-os @@ -720,6 +722,90 @@ non-ASCII names from /tmp.") (description "Make sure the mcron service works as advertised.") (value (run-mcron-test name)))) + +;;; +;;; Scron. +;;; + +(define %scron-os + ;; System with an scron service, with one scron job for "root" and one scron + ;; job for an unprivileged user. + (let ((job1 + (scron-job + (schedule "* * * * *") + (command "(id -u; id -g) > witness"))) + (job2 + (scron-job + (schedule "* * * * *") + (command "su -c '(id -u; id -g) > ~/witness' alice"))) + (job3 + (scron-job + (schedule "* * * * *") + (command "touch witness-touch")))) + (simple-operating-system + (service scron-service-type + (scron-configuration (jobs (list job1 job2 job3))))))) + +(define (run-scron-test name) + (define os + (marionette-operating-system + %scron-os + #:imported-modules '((gnu services herd) + (guix combinators)))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (srfi srfi-64) + (ice-9 match)) + + (define marionette + (make-marionette (list #$(virtual-machine os)))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "scron") + + (test-assert "service running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'scron)) + marionette)) + + ;; Make sure root's scron job runs, has its cwd set to "/", and + ;; runs with the right UID/GID. + (test-equal "root's job" + '(0 0) + (wait-for-file "/witness" marionette)) + + ;; Likewise for Alice's job. We cannot know what its GID is since + ;; it's chosen by 'groupadd', but it's strictly positive. + (test-assert "alice's job" + (match (wait-for-file "/home/alice/witness" marionette) + ((1000 gid) + (>= gid 100)))) + + ;; Last, the job that uses a command; allows us to test whether + ;; $PATH is sane. + (test-equal "root's job with command" + "" + (wait-for-file "/witness-touch" marionette + #:read '(@ (ice-9 rdelim) read-string))) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation name test)) + +(define %test-scron + (system-test + (name "scron") + (description "Make sure the scron service works as advertised.") + (value (run-scron-test name)))) + ;;; ;;; Avahi and NSS-mDNS.