~ruther/guix-local

7c820cd888746ae759926bd7889bef2c8319be87 — Mathieu Othacehe 1 year, 3 months ago 11b5443 
tests: Fix the gui installation tests.

This is a follow-up of: 4c017ccfe56a8887bf26faaea62d60501d7cc4f6. The
run-basic-test procedure is used for the gui installation tests, but the
etc-profile-d-service-type and etc-bashrc-d-service-type services that are now
needed are only defined in the test-basic-os procedure.

Build upon the introduction of the extra-tests argument to define the
etc-profile-d-service-type and etc-bashrc-d-service-type specific tests
directly in the test-basic-os procedure.

* gnu/tests/base.scm (run-basic-test): Move the etc-profile-d-service-type and
etc-bashrc-d-service-type dedicated tests to ...
(test-basic-os): ... that procedure, where the matching services are defined.

Change-Id: I050f5ab87e19889bc90cc1a375a3cc28ea9a43ab
patch browse .tar.gz .zip 
1 files changed, 32 insertions(+), 23 deletions(-)

M gnu/tests/base.scm

M gnu/tests/base.scm => gnu/tests/base.scm +32 -23
@@ 176,28 176,6 @@ grep --version
info --version")
                                    marionette)))

          (test-assert "/etc/profile.d is sourced"
            (zero? (marionette-eval '(system "
. /etc/profile
set -e -x
test -f /etc/profile.d/test_profile_d.sh
test \"$PROFILE_D_OK\" = yes")
                                    marionette)))

          (test-assert "/etc/bashrc.d is sourced"
            (zero? (marionette-eval
                    '(system* "bash"
                              "-i" ;run interactively
                              #$(plain-file "test_bashrc_d.sh"
                                            "\
. /etc/bashrc
set -e -x
test -f /etc/bashrc.d/bash_completion.sh
test -f /etc/bashrc.d/aliases.sh
test -f /etc/bashrc.d/test_bashrc_d.sh
test \"$BASHRC_D_OK\" = yes"))
                    marionette)))

          (test-equal "special files"
            '#$special-files
            (marionette-eval


@@ 634,7 612,38 @@ functionality tests, using the given KERNEL.")
      ;; 'system-qemu-image/shared-store-script'.
      (run-basic-test (virtualized-operating-system os '())
                      #~(list #$vm)
                      name)))))
                      name
                      ;; Add extra tests for the etc-profile-d-service-type
                      ;; and etc-bashrc-d-service-type services defined above.
                      ;; Those tests cannot directly be part of the
                      ;; run-basic-test procedure that is used in many other
                      ;; locations.
                      #:extra-tests
                      (lambda (marionette)
                        #~(begin
                            (test-assert "/etc/profile.d is sourced"
                              (zero?
                               (marionette-eval '(system "
. /etc/profile
set -e -x
test -f /etc/profile.d/test_profile_d.sh
test \"$PROFILE_D_OK\" = yes")
                                                #$marionette)))

                            (test-assert "/etc/bashrc.d is sourced"
                              (zero?
                               (marionette-eval
                                '(system* "bash"
                                          "-i" ;run interactively
                                          #$(plain-file "test_bashrc_d.sh"
                                                        "\
. /etc/bashrc
set -e -x
test -f /etc/bashrc.d/bash_completion.sh
test -f /etc/bashrc.d/aliases.sh
test -f /etc/bashrc.d/test_bashrc_d.sh
test \"$BASHRC_D_OK\" = yes"))
                                #$marionette))))))))))

(define %test-basic-os
  (test-basic-os))