From: Bruno Victal <mirai@makinata.eu>
To: 60756@debbugs.gnu.org
Cc: dev@jpoiret.xyz, Bruno Victal <mirai@makinata.eu>
Subject: [bug#60756] [PATCH v3 2/2] tests: gdm: Remove tmpfs related tests.
Date: Mon, 6 Mar 2023 12:35:02 +0000 [thread overview]
Message-ID: <56f1f2fbd4a0b9b442a53ebb41137a1d982d4bbe.1678105938.git.mirai@makinata.eu> (raw)
In-Reply-To: <4eab1cc425f89bf321477b432ba407a71285e974.1678105938.git.mirai@makinata.eu>
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.
---
Changes since v2:
* Tweaked commit message.
* substitute let* with let
gnu/tests/gdm.scm | 40 +++++++++++++---------------------------
1 file changed, 13 insertions(+), 27 deletions(-)
diff --git a/gnu/tests/gdm.scm b/gnu/tests/gdm.scm
index 70a86b9065..ec1df4b797 100644
--- a/gnu/tests/gdm.scm
+++ b/gnu/tests/gdm.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2022 Bruno Victal <mirai@makinata.eu>.
+;;; Copyright © 2022–2023 Bruno Victal <mirai@makinata.eu>.
;;;
;;; This file is part of GNU Guix.
;;;
@@ -23,36 +23,26 @@ (define-module (gnu tests gdm)
#: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))
+ %test-gdm-wayland))
-(define* (make-os #:key wayland? tmp-tmpfs?)
+(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?)))))
- (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?)
+ (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? #:tmp-tmpfs? tmp-tmpfs?)
+ (make-os #:wayland? wayland?)
#:imported-modules '((gnu services herd))))
(define vm
@@ -60,7 +50,7 @@ (define* (run-gdm-test #:key wayland? tmp-tmpfs?)
(operating-system os)
(memory-size 1024)))
- (define name (format #f "gdm-~:[x11~;wayland~]~:[~;-tmpfs~]" wayland? tmp-tmpfs?))
+ (define name (format #f "gdm-~:[x11~;wayland~]" wayland?))
(define test
(with-imported-modules '((gnu build marionette))
@@ -69,8 +59,8 @@ (define* (run-gdm-test #:key wayland? tmp-tmpfs?)
(ice-9 format)
(srfi srfi-64))
- (let* ((marionette (make-marionette (list #$vm)))
- (expected-session-type #$(if wayland? "wayland" "x11")))
+ (let ((marionette (make-marionette (list #$vm)))
+ (expected-session-type #$(if wayland? "wayland" "x11")))
(test-runner-current (system-test-runner #$output))
(test-begin #$name)
@@ -86,6 +76,9 @@ (define* (run-gdm-test #:key wayland? tmp-tmpfs?)
(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
@@ -118,10 +111,3 @@ (define %test-gdm-wayland
(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.39.1
next prev parent reply other threads:[~2023-03-06 12:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-12 15:43 [bug#60756] [PATCH 0/2] Add x11-socket-directory-service-type Bruno Victal
2023-01-12 15:46 ` [bug#60756] [PATCH 1/2] services: " Bruno Victal
2023-01-12 15:46 ` [bug#60756] [PATCH 2/2] Revert "tests: Add gdm tests." Bruno Victal
2023-01-12 15:49 ` [bug#60756] (no subject) Bruno Victal
2023-02-18 15:19 ` [bug#60756] [PATCH v2 1/2] services: Add x11-socket-directory-service-type Bruno Victal
2023-02-18 15:19 ` [bug#60756] [PATCH v2 2/2] tests: gdm: Remove tmpfs related tests Bruno Victal
2023-03-06 13:16 ` [bug#60756] [PATCH v2 1/2] services: Add x11-socket-directory-service-type Josselin Poiret via Guix-patches via
2023-03-06 12:35 ` [bug#60756] [PATCH v3 " Bruno Victal
2023-03-06 12:35 ` Bruno Victal [this message]
2023-03-21 20:50 ` bug#60756: [PATCH 0/2] " Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56f1f2fbd4a0b9b442a53ebb41137a1d982d4bbe.1678105938.git.mirai@makinata.eu \
--to=mirai@makinata.eu \
--cc=60756@debbugs.gnu.org \
--cc=dev@jpoiret.xyz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).