mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-29 07:42:23 -05:00
0c53cbcc56
This test never managed to reveal the problem described in [1] because from gnu/system/vm.scm it is seen that our "/tmp" mount is filtered out and replaced with a "/tmp" file-system that is mounted with (needed-for-boot? #t). This last bit is crucial as the problem was caused by the user specified "/tmp" file-system lacking this part which caused "/tmp" being mounted after x11-socket-directory-service has run, effectively shadowing the directory. [1]: <https://issues.guix.gnu.org/57589> * gnu/tests/gdm.scm (%test-gdm-wayland-tmpfs): Delete variable. (make-os): Remove tmpfs? argument. (run-gdm-test): Remove tmpfs? argument. Add a small delay since waiting for gdm.pid is not enough, causing the tests to fail sporadically. Reviewed-by: Josselin Poiret <dev@jpoiret.xyz> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
113 lines
4 KiB
Scheme
113 lines
4 KiB
Scheme
;;; GNU Guix --- Functional package management for GNU
|
||
;;; Copyright © 2022–2023 Bruno Victal <mirai@makinata.eu>.
|
||
;;;
|
||
;;; This file is part of GNU Guix.
|
||
;;;
|
||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||
;;; under the terms of the GNU General Public License as published by
|
||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||
;;; your option) any later version.
|
||
;;;
|
||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
;;; GNU General Public License for more details.
|
||
;;;
|
||
;;; You should have received a copy of the GNU General Public License
|
||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||
|
||
(define-module (gnu tests gdm)
|
||
#:use-module (gnu tests)
|
||
#:use-module (gnu packages freedesktop)
|
||
#:use-module (gnu services)
|
||
#:use-module (gnu services desktop)
|
||
#:use-module (gnu services xorg)
|
||
#:use-module (gnu system)
|
||
#:use-module (gnu system vm)
|
||
#:use-module (guix gexp)
|
||
#:use-module (ice-9 format)
|
||
#:export (%test-gdm-x11
|
||
%test-gdm-wayland))
|
||
|
||
(define* (make-os #:key wayland?)
|
||
(operating-system
|
||
(inherit %simple-os)
|
||
(services
|
||
(modify-services %desktop-services
|
||
(gdm-service-type config => (gdm-configuration
|
||
(inherit config)
|
||
(wayland? wayland?)))))))
|
||
|
||
(define* (run-gdm-test #:key wayland?)
|
||
"Run tests in a vm which has gdm running."
|
||
(define os
|
||
(marionette-operating-system
|
||
(make-os #:wayland? wayland?)
|
||
#:imported-modules '((gnu services herd))))
|
||
|
||
(define vm
|
||
(virtual-machine
|
||
(operating-system os)
|
||
(memory-size 1024)))
|
||
|
||
(define name (format #f "gdm-~:[x11~;wayland~]" wayland?))
|
||
|
||
(define test
|
||
(with-imported-modules '((gnu build marionette))
|
||
#~(begin
|
||
(use-modules (gnu build marionette)
|
||
(ice-9 format)
|
||
(srfi srfi-64))
|
||
|
||
(let ((marionette (make-marionette (list #$vm)))
|
||
(expected-session-type #$(if wayland? "wayland" "x11")))
|
||
|
||
(test-runner-current (system-test-runner #$output))
|
||
(test-begin #$name)
|
||
|
||
;; service for gdm is called xorg-server
|
||
(test-assert "service is running"
|
||
(marionette-eval
|
||
'(begin
|
||
(use-modules (gnu services herd))
|
||
(start-service 'xorg-server))
|
||
marionette))
|
||
|
||
(test-assert "gdm ready"
|
||
(wait-for-file "/var/run/gdm/gdm.pid" marionette))
|
||
|
||
;; waiting for gdm.pid is not enough, tests may still sporadically fail.
|
||
(sleep 1)
|
||
|
||
(test-equal (string-append "session-type is " expected-session-type)
|
||
expected-session-type
|
||
(marionette-eval
|
||
'(begin
|
||
(use-modules (ice-9 popen)
|
||
(ice-9 rdelim))
|
||
|
||
(let* ((loginctl #$(file-append elogind "/bin/loginctl"))
|
||
(get-session-cmd (string-join `(,loginctl "show-user" "gdm"
|
||
"--property Display" "--value")))
|
||
(session (call-with-port (open-input-pipe get-session-cmd) read-line))
|
||
(get-type-cmd (string-join `(,loginctl "show-session" ,session
|
||
"--property Type" "--value")))
|
||
(type (call-with-port (open-input-pipe get-type-cmd) read-line)))
|
||
type))
|
||
marionette))
|
||
|
||
(test-end)))))
|
||
|
||
(gexp->derivation (string-append name "-test") test))
|
||
|
||
(define %test-gdm-x11
|
||
(system-test
|
||
(name "gdm-x11")
|
||
(description "Basic tests for the GDM service. (X11)")
|
||
(value (run-gdm-test))))
|
||
|
||
(define %test-gdm-wayland
|
||
(system-test
|
||
(name "gdm-wayland")
|
||
(description "Basic tests for the GDM service. (Wayland)")
|
||
(value (run-gdm-test #:wayland? #t))))
|