amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: Fix the gui installation tests.

Browse source 
This is a follow-up of: 4c017ccfe5. 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
This commit is contained in:
Mathieu Othacehe 2025-06-29 15:54:05 +02:00
parent 11b5443e48
commit 7c820cd888
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 32 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

55
gnu/tests/base.scm
View file

@ -176,28 +176,6 @@ grep --version
info --version") info --version")
marionette))) 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" (test-equal "special files"
'#$special-files '#$special-files
(marionette-eval (marionette-eval
@ -634,7 +612,38 @@ functionality tests, using the given KERNEL.")
;; 'system-qemu-image/shared-store-script'. ;; 'system-qemu-image/shared-store-script'.
(run-basic-test (virtualized-operating-system os '()) (run-basic-test (virtualized-operating-system os '())
#~(list #$vm) #~(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 (define %test-basic-os
(test-basic-os)) (test-basic-os))