From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id EBtNMkH3t2SCjgAASxT56A (envelope-from ) for ; Wed, 19 Jul 2023 16:46:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id uBzgMUH3t2QWDAAAauVa8A (envelope-from ) for ; Wed, 19 Jul 2023 16:46:25 +0200 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 403DB35A08 for ; Wed, 19 Jul 2023 16:46:25 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=m2H2cQlx; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1689777985; 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: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: dkim-signature; bh=qzJBzuAS67kC5D9LJ+XSKv76w6EoOb9NZXMvTNphKKs=; b=bMU/l8tvtipQv7RPKrnD3Y1PFd6s2cV1K5Hbz71TVYHC7AVqyg/UkdQNSlGCyEv7jZRMcn 3Qgko8+PDg09r8i3upnnh1iZ7u9jqn/J3koFWfQTOEjX4DF4cxAQXik9Tk2AVwbaiNuaS7 7XpZHX9/KgK70hpUC6q7oti7DrRGbIbVRXS/X8WGc4YZxXl15yz/yFXum8AdrHViLSWyKG Ca9EoojhdadZ3NG0pXZ8N533B6RYLz3ydbrk9CrxMa01b5DzNbWcC8z/WAYrWQDqMm6wX4 QTNFncA0kUqNCddLfbGt7+v0dhNGrQMiEwa74mKZxJNNTA9fgxSTaQLqzjUTLQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1689777985; a=rsa-sha256; cv=none; b=CK+bRbgOl7MTGiWc7ZgsQ5IUtUt/HegjlcNTepYb0xNdL12MfG53na5aRsSaGdvyULiy4a bUBgr7znvt+RnJZZwmP8iJ9iN5I1LILX+xuL4l4kaNFy/IqXSjNz9OUXroV3xGnw8olfCE 0ODdjaO0cDKL1db0tFaSboRke9j2i8j+muE44eEjHhACk54cPuuBjmkylb5GVGSJ58wqqp zJQSDl4NldL2UzisEGn/slidXGU8N0bteVzScUwwmX5MsSspcU7yHM5aPldEf0YrMAC4vA po9yKwEwZVWCRrLiFBRK+fmZtlWdF9nyZPyphFLqlyotKFfP0UuVVbRMJy/WYQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=m2H2cQlx; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qM8RK-0008TM-8s; Wed, 19 Jul 2023 10:46:06 -0400 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 1qM8RH-0008Su-JT for guix-patches@gnu.org; Wed, 19 Jul 2023 10:46:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qM8RG-0003bn-E0 for guix-patches@gnu.org; Wed, 19 Jul 2023 10:46:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qM8RG-00058D-9M for guix-patches@gnu.org; Wed, 19 Jul 2023 10:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64356] [PATCH 0/4] Fix GDM and VNC tests Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Jul 2023 14:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64356 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Bruno Victal Cc: 64356@debbugs.gnu.org Received: via spool by 64356-submit@debbugs.gnu.org id=B64356.168977795219707 (code B ref 64356); Wed, 19 Jul 2023 14:46:02 +0000 Received: (at 64356) by debbugs.gnu.org; 19 Jul 2023 14:45:52 +0000 Received: from localhost ([127.0.0.1]:56910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qM8R6-00057m-81 for submit@debbugs.gnu.org; Wed, 19 Jul 2023 10:45:52 -0400 Received: from mail-qk1-x72e.google.com ([2607:f8b0:4864:20::72e]:54672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qM8Qy-00057S-Qq for 64356@debbugs.gnu.org; Wed, 19 Jul 2023 10:45:51 -0400 Received: by mail-qk1-x72e.google.com with SMTP id af79cd13be357-765942d497fso626215885a.1 for <64356@debbugs.gnu.org>; Wed, 19 Jul 2023 07:45:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689777939; x=1690382739; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=qzJBzuAS67kC5D9LJ+XSKv76w6EoOb9NZXMvTNphKKs=; b=m2H2cQlxO9rSuIKJ4TqTd2sCFMGExq15m/6zJNWmfTpOjpS3WSLv6Byxpc+Dum9AMJ pLx6k0n/Hyyy8HQkEii57W7X8dQ0SrrCw/fs7SxhDTgUIyw9wDrFYDtNkG3PwOp83v2D f0E5oCZETyZhXo8Huo0XzM8LSb77poorsXo2sf+Qh8dvciHB6cmuHLl/i2gecaDn92bC JLlTtfwY06gy/5rjSpElIp1A+qfB2vZH3F04zUquqAP/6iN9AADrlJ50FrhBB4Wffn49 2qTd8KdtXkTRiXVtMumgU3hFajZTJFk/5UNokJoLVxKjiQqpn/h+xcaV1rNyhT2A5HA/ sjxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689777939; x=1690382739; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qzJBzuAS67kC5D9LJ+XSKv76w6EoOb9NZXMvTNphKKs=; b=Y09c3yp0XSAN4LwRNVTy+KAMzS3CFfGXi3nLUZVWeAH3FNYdNIPeAlI7AHSnxnU4lx 0wCGIuBtz8z26mU6pu9qS6MEAKBHqQxNhPbSs3DMPgHSlEWOnZuV9hCAXVAWqFCsNkIC DxSTuL993IeG8TSgFZgP1XH5203WgGKPRYHhqWNZSGlxGhY3wG4Q27fQNZZTYRK1q2/2 o04AevzCxTo5sQ6sG3fZl7+H0u6rDz4HPvMbeOlCyV+eBOnN2rIPzyu4PH037a69OOZK lgc4HhqbPssZxDUXS22PaGgeJQW2I3OrlEELwnPfGARwLaTRxse2tX5ldpCknXAVx0D7 lO/Q== X-Gm-Message-State: ABy/qLYtWrVjTab7A6bDcB6AZY0IuoOi6lpmEXybFlkZYKoDvZSUbaRK hirTWCfRZ8uy7BeorFj5PmcC5Nclirw= X-Google-Smtp-Source: APBJJlHujP53KoBHuF16BmRU+DbqKF8O4cz1641ZM3tUOSWTXU3Gqhu/YvzrIrhDr5hJdBMpyQJHEQ== X-Received: by 2002:a05:620a:29d3:b0:767:ba3e:b3c4 with SMTP id s19-20020a05620a29d300b00767ba3eb3c4mr26775595qkp.7.1689777938960; Wed, 19 Jul 2023 07:45:38 -0700 (PDT) Received: from hurd (dsl-159-145.b2b2c.ca. [66.158.159.145]) by smtp.gmail.com with ESMTPSA id g6-20020ae9e106000000b00767dc4c539bsm1310075qkm.44.2023.07.19.07.45.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 07:45:38 -0700 (PDT) From: Maxim Cournoyer References: <7085d63fde78e3d15b28fba3c710b6a71a185c2f.1688133473.git.mirai@makinata.eu> Date: Wed, 19 Jul 2023 10:45:37 -0400 In-Reply-To: <7085d63fde78e3d15b28fba3c710b6a71a185c2f.1688133473.git.mirai@makinata.eu> (Bruno Victal's message of "Fri, 30 Jun 2023 14:58:13 +0100") Message-ID: <87h6q0klim.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Spam-Score: 2.86 X-Spam-Score: 2.86 X-Migadu-Queue-Id: 403DB35A08 X-TUID: k6zW4OMsFH1a Hi, Bruno Victal writes: > * gnu/tests/gdm.scm (run-gdm-test): Use wait-for-screen-text instead of sleep. > --- > gnu/tests/gdm.scm | 19 ++++++++++++++----- > 1 file changed, 14 insertions(+), 5 deletions(-) > > diff --git a/gnu/tests/gdm.scm b/gnu/tests/gdm.scm > index ec1df4b797..06177d4080 100644 > --- a/gnu/tests/gdm.scm > +++ b/gnu/tests/gdm.scm > @@ -19,6 +19,7 @@ > (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) > @@ -57,6 +58,7 @@ (define* (run-gdm-test #:key wayland?) > #~(begin > (use-modules (gnu build marionette) > (ice-9 format) > + (srfi srfi-26) > (srfi srfi-64)) > > (let ((marionette (make-marionette (list #$vm))) > @@ -73,11 +75,18 @@ (define* (run-gdm-test #:key wayland?) > (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-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")))) I modified it to use #:timeout 120, to accommodate older, slow systems like mine. -- Thanks, Maxim