From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwknj-0001A8-Mp for guix-patches@gnu.org; Tue, 26 Sep 2017 04:01:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwkne-0001v6-ON for guix-patches@gnu.org; Tue, 26 Sep 2017 04:01:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:50912) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dwkne-0001v1-Jg for guix-patches@gnu.org; Tue, 26 Sep 2017 04:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dwkne-0004K7-8S for guix-patches@gnu.org; Tue, 26 Sep 2017 04:01:02 -0400 Subject: [bug#28600] [PATCH] tests: install: Switch to modifying the gc-root-service-type. Resent-Message-ID: Date: Tue, 26 Sep 2017 09:00:48 +0100 From: Christopher Baines Message-ID: <20170926090048.72724ba9@cbaines.net> In-Reply-To: <878th13nst.fsf@gnu.org> References: <20170925195810.26912-1-mail@cbaines.net> <878th13nst.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/RU3J.us4F3nj/hqJ4cJaTCu"; 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 28600@debbugs.gnu.org --Sig_/RU3J.us4F3nj/hqJ4cJaTCu Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Tue, 26 Sep 2017 09:46:10 +0200 ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > Hi! >=20 > Christopher Baines skribis: >=20 > > Rather than adding the service to the system. > > > > The previous approach is causing the system tests to fail, as the > > os already contains a service of type gc-root-service-type, and the > > way that this service extends the system-service doesn't compose, > > causing an error if its added twice. > > > > ERROR: In procedure symlink: File exists =20 >=20 > Good catch! >=20 > > * gnu/tests/install.scm (operating-system-with-gc-roots): Modify > > the existing gc-root-service, rather than adding another. > > --- > > gnu/tests/install.scm | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm > > index 49743860e..28dfc3b8b 100644 > > --- a/gnu/tests/install.scm > > +++ b/gnu/tests/install.scm > > @@ -127,8 +127,9 @@ > > "Return a variant of OS where ROOTS are registered as GC roots." > > (operating-system > > (inherit os) > > - (services (cons (service gc-root-service-type roots) > > - (operating-system-user-services os))))) > > + (services > > + (modify-services (operating-system-user-services os) > > + (gc-root-service-type _ =3D> roots))))) =20 >=20 > What about: >=20 > (services (cons (simple-service 'extra-root > gc-root-service-type roots) > (operating-system-user-services os))) >=20 > This would make sure there=E2=80=99s always a single =E2=80=98gc-root-ser= vice-type=E2=80=99 > instance, and we=E2=80=99re just extending it with additional roots, rath= er > than overriding what it does. That fixes this issue, but I'm not sure what it means for the tests. If the roots are not replaced, then the bare-bones-os will be present as well as the roots added for each test. This is just a thought though, I'm fine with either fix. --Sig_/RU3J.us4F3nj/hqJ4cJaTCu Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlnKCTBfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XdJRw/7B9M/5FoZPHY6yG2gK1Czh0mTR55fWGDr81tjJElTkFdZ0Xm1KG0FZQDP grSvAcdqZ6sGA39RhP6qak7WGZd8dqqCHB8jPPHrTbwrgddke6mpCUBDylSptU9c OOOjlD1v83JFiSd8fDhwpLTaLdOfJFjkRKyOiFbvNvAr/TEgtW/jDXnNvUDhqRzJ zNqAHxZtxYQSSQgsWr/xub8pC3+jcPNbyqS5Htz9cfB6vQlqMccQfQe6LzbosLMZ 5FybsA3cLlwwkghY50axSO4ed9yKVjb2fnNjQTsIqft3hPr1Lgk/uzLZv82iHrez JJuqiReTIIpsw4cMwYRVrh7qCBIIteaC9+s5jYpHBMMsUqvsj2GqYt//iQOdydVB sftoI5onpfAfkaRq12ukGqYSkxHMJDA7GLp9FfMTfOe8iLTftjeEZIiSGEoe5o0u 28xh+18VnCfUaK9KJ649mMEaTAVWIIwN94+Ju96IokC6vW1wRG6y4P4Rpd1emBvi zckH3XJyoaDoTCooXUqxak4GC3T9wQy1LouHXP9Nw86SKch3IL7gk9WVavB/uF0u sn2h/f41crlCePPH7DUDmw++jPj246SJOjPHXs5duGWC9Jfcjf9zUM0vVP+QjPCs 1SiZApblhz1+9SMmt5XSaLlIwMfLLLcFfqSTm1zNRrXwx7ViJ3M= =38ZG -----END PGP SIGNATURE----- --Sig_/RU3J.us4F3nj/hqJ4cJaTCu--