~ruther/guix-local

caf5869a1d88bb4a40705916b120cc31f25ccd09 — Ludovic Courtès 1 year, 3 months ago 59bd133
tests: Make ‘operating-system-with-console-syslog’ public.

* gnu/tests/install.scm (operating-system-with-console-syslog): Move to…
* gnu/tests.scm (operating-system-with-console-syslog): … here.  New
procedure.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I015e24525140365d09f22127d366107fdc9ca902
2 files changed, 21 insertions(+), 20 deletions(-)

M gnu/tests.scm
M gnu/tests/install.scm
M gnu/tests.scm => gnu/tests.scm +21 -0
@@ 53,6 53,7 @@

            %simple-os
            simple-operating-system
            operating-system-with-console-syslog

            system-test
            system-test?


@@ 268,6 269,26 @@ the system under test."
                    (services (cons* user-services ... %base-services))))


(define (operating-system-with-console-syslog os)
  "Return OS with a system log service that writes to /dev/console."
  (operating-system
    (inherit os)
    (services
     (modify-services (operating-system-user-services os)
       (shepherd-system-log-service-type
        config
        =>
        (system-log-configuration
         (inherit config)
         (message-destination
          #~(lambda (message)
              (let ((destinations ((default-message-destination-procedure)
                                   message)))
                (if (<= (system-log-message-priority message)
                        (system-log-priority info))
                    (cons "/dev/console" destinations)
                    destinations))))))))))


;;;
;;; Tests.

M gnu/tests/install.scm => gnu/tests/install.scm +0 -20
@@ 1784,26 1784,6 @@ build (current-guix) and then store a couple of full system images.")
;;; Installation through the graphical interface.
;;;

(define (operating-system-with-console-syslog os)
  "Return OS with a syslog service that writes to /dev/console."
  (operating-system
    (inherit os)
    (services
     (modify-services (operating-system-user-services os)
       (shepherd-system-log-service-type
        config
        =>
        (system-log-configuration
         (inherit config)
         (message-destination
          #~(lambda (message)
              (let ((destinations ((default-message-destination-procedure)
                                   message)))
                (if (<= (system-log-message-priority message)
                        (system-log-priority info))
                    (cons "/dev/console" destinations)
                    destinations))))))))))

(define %root-password "foo")

(define* (gui-test-program marionette