Subject: [PATCH 2/2] Revert "tests: Add gdm tests."

From: Bruno Victal <[email-masked]>
Date: Thu, 12 Jan 2023 15:46:29 +0000

This reverts commit b2a848d23d37f31496e1ff664f1dcf6abcdcc388.

No longer required with the introduction of x11-socket-directory-service-type.

These tests never managed to reveal the problem described in #57589 because
from gnu/system/vm.scm it is seen that "/tmp" is mounted with (needed-for-boot? #t)
and that the virtualized-operating-system procedure strips our custom defined "/tmp"
filesystem entries.
---
 gnu/local.mk      |   1 -
 gnu/tests/gdm.scm | 127 ----------------------------------------------
 2 files changed, 128 deletions(-)
 delete mode 100644 gnu/tests/gdm.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index 184f43e753..e0841c8dbb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -765,7 +765,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/tests/docker.scm				\
   %D%/tests/file-sharing.scm			\
   %D%/tests/ganeti.scm				\
-  %D%/tests/gdm.scm				\
   %D%/tests/guix.scm				\
   %D%/tests/monitoring.scm                      \
   %D%/tests/nfs.scm				\
diff --git a/gnu/tests/gdm.scm b/gnu/tests/gdm.scm
deleted file mode 100644
index 70a86b9065..0000000000
--- a/gnu/tests/gdm.scm
+++ /dev/null
@@ -1,127 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2022 Bruno Victal <[email-masked]>.
-;;;
-;;; 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 file-systems)
-  #:use-module (gnu system vm)
-  #:use-module (guix gexp)
-  #:use-module (ice-9 format)
-  #:export (%test-gdm-x11
-            %test-gdm-wayland
-            %test-gdm-wayland-tmpfs))
-
-(define* (make-os #:key wayland? tmp-tmpfs?)
-  (operating-system
-    (inherit %simple-os)
-    (services
-     (modify-services %desktop-services
-       (gdm-service-type config => (gdm-configuration
-                                    (inherit config)
-                                    (wayland? wayland?)))))
-    (file-systems (if tmp-tmpfs? (cons (file-system
-                                         (mount-point "/tmp")
-                                         (device "none")
-                                         (type "tmpfs")
-                                         (flags '(no-dev no-suid))
-                                         (check? #f))
-                                       %base-file-systems)
-                      %base-file-systems))))
-
-(define* (run-gdm-test #:key wayland? tmp-tmpfs?)
-  "Run tests in a vm which has gdm running."
-  (define os
-    (marionette-operating-system
-     (make-os #:wayland? wayland? #:tmp-tmpfs? tmp-tmpfs?)
-     #:imported-modules '((gnu services herd))))
-
-  (define vm
-    (virtual-machine
-     (operating-system os)
-     (memory-size 1024)))
-
-  (define name (format #f "gdm-~:[x11~;wayland~]~:[~;-tmpfs~]" wayland? tmp-tmpfs?))
-
-  (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))
-
-            (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))))
-
-(define %test-gdm-wayland-tmpfs
-  (system-test
-   ;; See <https://issues.guix.gnu.org/57589>.
-   (name "gdm-wayland-tmpfs")
-   (description "Basic tests for the GDM service. (Wayland, /tmp as tmpfs)")
-   (value (run-gdm-test #:wayland? #t #:tmp-tmpfs? #t))))
-- 
2.38.1