From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52225) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwZX0-00014b-2r for guix-patches@gnu.org; Mon, 25 Sep 2017 15:59:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwZWw-0003cP-F1 for guix-patches@gnu.org; Mon, 25 Sep 2017 15:59:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:50294) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dwZWw-0003cL-By for guix-patches@gnu.org; Mon, 25 Sep 2017 15:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dwZWw-0004kV-5J for guix-patches@gnu.org; Mon, 25 Sep 2017 15:59:02 -0400 Subject: [bug#28600] [PATCH] tests: install: Switch to modifying the gc-root-service-type. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwZWD-0000vO-S9 for guix-patches@gnu.org; Mon, 25 Sep 2017 15:58:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwZWA-0003Ny-Qp for guix-patches@gnu.org; Mon, 25 Sep 2017 15:58:17 -0400 Received: from mira.cbaines.net ([2a01:7e00::f03c:91ff:fe69:8da9]:55699) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwZWA-0003NW-KB for guix-patches@gnu.org; Mon, 25 Sep 2017 15:58:14 -0400 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 7385B13D1D9 for ; Mon, 25 Sep 2017 20:58:11 +0100 (BST) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 1526303f for ; Mon, 25 Sep 2017 19:58:11 +0000 (UTC) From: Christopher Baines Date: Mon, 25 Sep 2017 20:58:10 +0100 Message-Id: <20170925195810.26912-1-mail@cbaines.net> 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: 28600@debbugs.gnu.org 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 * 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 _ => roots))))) (define MiB (expt 2 20)) -- 2.14.1