;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022⁠–⁠2023 Bruno Victal . ;;; ;;; 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 . (define-module (gnu tests gdm) #:use-module (gnu tests) #:use-module (gnu packages freedesktop) #:use-module (gnu packages ocr) #: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-26) (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-group "gdm ready" (test-assert "PID file present" (wait-for-file "/var/run/gdm/gdm.pid" marionette)) ;; Waiting for gdm.pid is not enough, tests may still sporadically ;; fail; ensure that the login screen is up. ;; XXX: GNU Ocrad works but with '--invert' only. (test-assert "login screen up" (wait-for-screen-text marionette (cut string-contains <> "Guix") #:ocr #$(file-append ocrad "/bin/ocrad") #:ocr-arguments '("--invert") #:timeout 120))) ;for slow systems (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)))) r> 2021-04-08etc/committer: Record minimal context for hunks to avoid problems....With zero context new definitions would be applied to the wrong location in the file. More context lines lead to larger hunks, though, so we use just one line of context. * etc/committer.scm.in (diff-info): Invoke "git diff" with one line of context. [info]: Merge line break and first line. (lines-to-first-change): New procedure. (old-sexp, new-sexp): Use it. Ricardo Wurmus 2021-04-08etc/committer: Define delay duration as a variable....* etc/committer.scm.in (%delay): New variable. (main): Use it. Ricardo Wurmus 2021-04-08etc/committer: Handle package additions....* etc/committer.scm.in (<hunk>)[diff]: Rename this field... [diff-lines]: ...to this. [definition?]: New field. (hunk->patch): Join diff lines. (diff-info): Do not join diff lines; record whether a hunk is a new definition. (commit-message): Rename this procedure... (change-commit-message): ...to this. (add-commit-message): New procedure. (main): Handle new package definitions before changes. Ricardo Wurmus 2020-10-06etc: committer: Use EQUAL? instead of EQ? for differences....* etc/committer.scm.in (commit-message): Use EQUAL? instead of EQ? to compute differences because not all inputs may be symbols; some could be expressions. Ricardo Wurmus 2020-06-16etc: Add committer script....* etc/committer.scm.in: New file. * configure.ac: Configure it. Ricardo Wurmus