[debbugs-tracker] bug#28600: closed ([PATCH] tests: install: Switch to modifying the gc-root-service-type.)

[GNU bug Tracking System]

Your message dated Tue, 26 Sep 2017 10:46:02 +0200
with message-id <address@hidden>
and subject line Re: [bug#28600] [PATCH] tests: install: Switch to modifying 
the gc-root-service-type.
has caused the debbugs.gnu.org bug report #28600,
regarding [PATCH] tests: install: Switch to modifying the gc-root-service-type.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
28600: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=28600
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] tests: install: Switch to modifying the gc-root-service-type.
>
>
>
>
> Date: 
>
> Mon, 25 Sep 2017 20:58:10 +0100
>
>
>
>
> 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
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#28600] [PATCH] tests: install: Switch to modifying the gc-root-service-type.
>
>
>
>
> Date: 
>
> Tue, 26 Sep 2017 10:46:02 +0200
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux)
>
>
>
>
> Christopher Baines <address@hidden> skribis:
>
> > On Tue, 26 Sep 2017 09:46:10 +0200
> > address@hidden (Ludovic Courtès) wrote:
>
> [...]
>
> >> What about:
> >> 
> >>   (services (cons (simple-service 'extra-root
> >>                                   gc-root-service-type roots)
> >>                   (operating-system-user-services os)))
> >> 
> >> This would make sure there’s always a single ‘gc-root-service-type’
> >> instance, and we’re just extending it with additional roots, rather
> >> 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.
>
> I think it’s OK, because that’s what we want to test: we want to test
> the installation image with few modifications compared to what we’re
> shipping.
>
> Pushed as 945a8fc240dbc48e3e4e212ef527eadc70231d39.
>
> Now to see if there are still issues?
>
> Thanks!
>
> Ludo’.
>
>
> --- End Message ---