From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id SJcXCcLs8GOtaAEAbAwnHQ (envelope-from ) for ; Sat, 18 Feb 2023 16:20:34 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id AJ4DCcLs8GOPHQEAauVa8A (envelope-from ) for ; Sat, 18 Feb 2023 16:20:34 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8E417383A5 for ; Sat, 18 Feb 2023 16:20:33 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pTP0N-0007kr-UR; Sat, 18 Feb 2023 10:20:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pTP0M-0007ke-Tn for guix-patches@gnu.org; Sat, 18 Feb 2023 10:20:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pTP0M-0006Ux-KL for guix-patches@gnu.org; Sat, 18 Feb 2023 10:20:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pTP0M-0001M3-Dn for guix-patches@gnu.org; Sat, 18 Feb 2023 10:20:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60756] [PATCH v2 2/2] tests: gdm: Remove tmpfs related tests. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Feb 2023 15:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60756 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60756@debbugs.gnu.org Cc: me@tobias.gr, Bruno Victal Received: via spool by 60756-submit@debbugs.gnu.org id=B60756.16767335925181 (code B ref 60756); Sat, 18 Feb 2023 15:20:02 +0000 Received: (at 60756) by debbugs.gnu.org; 18 Feb 2023 15:19:52 +0000 Received: from localhost ([127.0.0.1]:44747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTP0C-0001LU-0Z for submit@debbugs.gnu.org; Sat, 18 Feb 2023 10:19:52 -0500 Received: from smtpmciv6.myservices.hosting ([185.26.106.201]:51690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTP09-0001LM-Qa for 60756@debbugs.gnu.org; Sat, 18 Feb 2023 10:19:50 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv6.myservices.hosting (Postfix) with ESMTP id BA85820CD8; Sat, 18 Feb 2023 16:19:48 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 65DA080097; Sat, 18 Feb 2023 16:19:48 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id hnZx4hOvw1v1; Sat, 18 Feb 2023 16:19:48 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id AD83180079; Sat, 18 Feb 2023 16:19:47 +0100 (CET) From: Bruno Victal Date: Sat, 18 Feb 2023 15:19:32 +0000 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: <156c8abd42d67c8174f274ca933bdc495efc1962.1676733543.git.mirai@makinata.eu> References: <156c8abd42d67c8174f274ca933bdc495efc1962.1676733543.git.mirai@makinata.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676733633; a=rsa-sha256; cv=none; b=M3TZnVWgNKwCDviW/QtxdOTWFe0uw2P0HT6f2HM/w6ghNEq017VssfUeKrkcWxaysSWOva cTaoriMR7/7evfwwoWKdIuyzTA4fNs17AO5FGbWkxYL4LzkfyHtpaekot1PdygqzUsGzjd kK3TQqOzeusF7CRu6l6bejshbEnY4o1i9J9J4hgJDjjJue/70YtuyZt6rKRo/1/EZ/3lMG Ihgf9lj8NxcLol3xxDzzfsF1K3jZQMALZ8xEiVbgLwF7HwVaP8OWE7mAQlrvwU/coJJkGn lQyobxgHpoe/7rXz6x249S4lWEiP5SrnOTFF7nXIvIxBcwkvp/MJhawObt4mqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676733633; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=ZxLOI4CkA+SiS6op4UxLX+RzqQManZ3q3wz55ydXfCw=; b=ECShj4C3s6Mpr8m7ZseWyDCyhalqgp/G9gheH2H8MCx2KW5aqYSaFxnOyzUhPCd8heYeVa 8Sbq14CwcsL3ODZiDuh+eqtSH/NZe4m3tpnMxtTGY5rUNWYVs7hdqdmcNkUprvbn3YrUOT H5OoZDvGfRYdhXuJy3wheKwXhU+dWRCL05ji/PiruhWvlETALdJGMLBlokzBpuhDAsgsvM LGTyDIaJbPDAmvwLX/QOegFluf5Jb/NXzPo/C5RSRHdLljMQHtfBHiFM7m3UqFrVIBCtns y50e62ha3MjFLeUquMhETijj9UyoFqRZeuGcsJPTCFYKA7pzPHbK+R0kYO3iCQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.13 X-Spam-Score: -2.13 X-Migadu-Queue-Id: 8E417383A5 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn1.migadu.com X-TUID: pPYITzJwuihu No longer required with the introduction of x11-socket-directory-service-type. This test never managed to reveal the problem described in #57589 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. * 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. --- gnu/tests/gdm.scm | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/gnu/tests/gdm.scm b/gnu/tests/gdm.scm index 70a86b9065..70affb3ee6 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 . +;;; Copyright © 2022⁠–⁠2023 Bruno Victal . ;;; ;;; 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)) @@ -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 . - (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