From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:48299) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvLKe-0007SE-Iv for guix-patches@gnu.org; Wed, 07 Aug 2019 08:46:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvLKV-00040x-4U for guix-patches@gnu.org; Wed, 07 Aug 2019 08:46:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57572) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hvLKN-0003vr-IY for guix-patches@gnu.org; Wed, 07 Aug 2019 08:46:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hvLKN-0000Ld-Fq for guix-patches@gnu.org; Wed, 07 Aug 2019 08:46:03 -0400 Subject: [bug#36953] [PATCH] reconfigure: Improve tests for system activation. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:48184) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvLKH-0007Ky-5g for guix-patches@gnu.org; Wed, 07 Aug 2019 08:45:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvLKF-0003qO-Vf for guix-patches@gnu.org; Wed, 07 Aug 2019 08:45:57 -0400 Received: from mx.sdf.org ([205.166.94.20]:65364) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hvLKF-0003pU-Iz for guix-patches@gnu.org; Wed, 07 Aug 2019 08:45:55 -0400 Received: from Epsilon (pool-173-76-53-40.bstnma.fios.verizon.net [173.76.53.40]) (authenticated (0 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id x77CjrkZ018386 (using TLSv1.2 with cipher AES256-GCM-SHA384 (256 bits) verified NO) for ; Wed, 7 Aug 2019 12:45:54 GMT From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) Date: Wed, 07 Aug 2019 08:42:42 -0400 Message-ID: <87r25x4059.fsf@sdf.lonestar.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36953@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * gnu/tests/reconfigure.scm (run-switch-to-system-test): Assert that '/run/current-system' points to the activated system, and that new user accounts specified in the operating system declaration are created. =2D-- gnu/tests/reconfigure.scm | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/gnu/tests/reconfigure.scm b/gnu/tests/reconfigure.scm index 3a2f0a2e53..fb11e6164e 100644 =2D-- a/gnu/tests/reconfigure.scm +++ b/gnu/tests/reconfigure.scm @@ -19,8 +19,10 @@ (define-module (gnu tests reconfigure) #:use-module (gnu bootloader) #:use-module (gnu services shepherd) =2D #:use-module (gnu system vm) #:use-module (gnu system) + #:use-module (gnu system accounts) + #:use-module (gnu system shadow) + #:use-module (gnu system vm) #:use-module (gnu tests) #:use-module (guix derivations) #:use-module (guix gexp) @@ -43,7 +45,13 @@ generation of the system profile." (define os (marionette-operating-system =2D (simple-operating-system) + (operating-system + (inherit (simple-operating-system)) + (users (cons (user-account + (name "jakob") + (group "users") + (home-directory "/home/jakob")) + %base-user-accounts))) #:imported-modules '((gnu services herd) (guix combinators)))) =20 @@ -84,7 +92,25 @@ generation of the system profile." =20 (test-equal "script created new generation" (length (system-generations marionette)) =2D (1+ (length generations-prior)))) + (1+ (length generations-prior))) + + (test-assert "script activated the new generation" + (and (eqv? 'symlink + (marionette-eval + '(stat:type (lstat "/run/current-system")) + marionette)) + (string=3D #$os + (marionette-eval + '(readlink "/run/current-system") + marionette)))) + + (test-assert "script activated user accounts" + (marionette-eval + '(string-contains (call-with-input-file "/etc/passwd" + (lambda (port) + (get-string-all port))) + "jakob") + marionette))) =20 (test-end) (exit (=3D (test-runner-fail-count (test-runner-current)) 0))))) =2D-=20 2.22.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEa1VJLOiXAjQ2BGSm9Qb9Fp2P2VoFAl1Kx0IACgkQ9Qb9Fp2P 2VotMBAAmeGeO4/GRlk+YqPjTUIpqSdmgymQ0JbjshdjGjHR767Bb9bjCvYkFOc7 4C4OHGGaedVk2UxwCs5m68O61dWTwPN4TMWiGKYnlxtt3t6R02xtQw4rUoQ0lJ94 N25NyAXx563jqqcrHvubCCkT97JfVPSCNaRHlxjDMyEVNsfxalwLBvaRmU3zzGzv qICgCjnaldkgrzgWsxYzYi8sB4WRaD3Rid7unxezlzEMEpE/KnY0L+u4YwII7A8Y dfogNNfgcrmlRvyhtLxN+e0mDa/xmeY+HqMlYbJ9rmVkSg5rjqENPviYfAzVzcUu VnRlFT2Pkz9BXMCJlUcUyCrLkuj565v9CR2zv2Cukph+8zl7NIzdeGBfeaZHFZCA 6cePiS/yLaRMxLiCPYYQJCtQeWs6G2cp+bwv7X7FcRhhB9VIQmfCpsL89qcdhMLv 7QLG6xoR+QXSpTbTZL4jl2hfQbqbzEF2CDy84p+gqdOH9pmZb8niW7coYmovhT2X pcUCKAeCy+4g4EXxZl2YJ+NEvXhHFyFZDQYtNOW/yVAZ8S5gS/uWS16E13AhLI5I RM9DtN7maj3mUjt5eR4GdwKo9xliUw3RmMqsNjr7MJepj4Cmyh3GTIALCPo1Mifx TCc4BxGNqZS5UTPXFC1m/Ph5Qd02TkJyRkVophWY3xVG43qhap0= =4wDU -----END PGP SIGNATURE----- --=-=-=--