[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#64356] [PATCH v3 3/4] tests: gdm: Prefer OCR to delay.
From: |
Bruno Victal |
Subject: |
[bug#64356] [PATCH v3 3/4] tests: gdm: Prefer OCR to delay. |
Date: |
Fri, 30 Jun 2023 14:58:13 +0100 |
* 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"))))
(test-equal (string-append "session-type is "
expected-session-type)
expected-session-type
--
2.39.2
- [bug#64356] [PATCH 1/4] tests: xvnc: Fix test., (continued)
- [bug#64356] [PATCH 1/4] tests: xvnc: Fix test., Bruno Victal, 2023/06/29
- [bug#64356] [PATCH 3/4] tests: gdm: Prefer OCR to delay., Bruno Victal, 2023/06/29
- [bug#64356] [PATCH 4/4] tests: xvnc: Group up GDM test., Bruno Victal, 2023/06/29
- [bug#64356] [PATCH v2 3/4] tests: gdm: Prefer OCR to delay., Bruno Victal, 2023/06/29
- [bug#64356] [PATCH v2 4/4] tests: xvnc: Group up GDM test., Bruno Victal, 2023/06/29
- [bug#64356] [PATCH v2 2/4] marionette: Allow passing custom OCR arguments., Bruno Victal, 2023/06/29
- [bug#64356] [PATCH v2 1/4] tests: xvnc: Fix test., Bruno Victal, 2023/06/29
- [bug#64356] [PATCH v3 0/4] Fix GDM + VNC tests, Bruno Victal, 2023/06/30
- [bug#64356] [PATCH 0/4] Fix GDM and VNC tests, Maxim Cournoyer, 2023/06/30