[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/13: marionette: Improve the error message of 'wait-for-screen-text'.
From: |
guix-commits |
Subject: |
11/13: marionette: Improve the error message of 'wait-for-screen-text'. |
Date: |
Sun, 28 Aug 2022 22:33:12 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 697b797160f8145f282767cedd66be2d7297fe1e
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Aug 12 08:53:46 2022 -0400
marionette: Improve the error message of 'wait-for-screen-text'.
* gnu/build/marionette.scm (wait-for-screen-text): Return the last OCR'd
text
when the predicate fails to match instead of the not useful predicate
object.
---
gnu/build/marionette.scm | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm
index 4f409166db..24170bbd30 100644
--- a/gnu/build/marionette.scm
+++ b/gnu/build/marionette.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
+;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -308,13 +309,14 @@ PREDICATE, whichever comes first. Raise an error when
TIMEOUT is exceeded."
(define end
(+ start timeout))
- (let loop ()
+ (let loop ((last-text #f))
(if (> (car (gettimeofday)) end)
- (error "'wait-for-screen-text' timeout" predicate)
- (or (predicate (marionette-screen-text marionette #:ocrad ocrad))
- (begin
- (sleep 1)
- (loop))))))
+ (error "'wait-for-screen-text' timeout" 'ocr-text: last-text)
+ (let ((text (marionette-screen-text marionette #:ocrad ocrad)))
+ (or (predicate text)
+ (begin
+ (sleep 1)
+ (loop text)))))))
(define %qwerty-us-keystrokes
;; Maps "special" characters to their keystrokes.
- 07/13: gnu: lightdm-gtk-greeter: Adjust --enable-at-spi-command value., (continued)
- 07/13: gnu: lightdm-gtk-greeter: Adjust --enable-at-spi-command value., guix-commits, 2022/08/28
- 10/13: gnu: lightdm: Apply patch to fix color depth issue with VNC., guix-commits, 2022/08/28
- 01/13: gnu: accountsservice: Update to 22.08.8, enable doc and test suite., guix-commits, 2022/08/28
- 02/13: gnu: accountsservice: Provide a means to locate extensions., guix-commits, 2022/08/28
- 06/13: gnu: lightdm-gtk-greeter: Adjust default config file path., guix-commits, 2022/08/28
- 04/13: gnu: lightdm-gtk-greeter: Use the glib-or-gtk-wrap phase as-is., guix-commits, 2022/08/28
- 09/13: gnu: lightdm: Apply patch to allow using VNC options., guix-commits, 2022/08/28
- 12/13: build: marionette: Add support for Tesseract OCR., guix-commits, 2022/08/28
- 13/13: services: Add lightdm-service-type., guix-commits, 2022/08/28
- 08/13: gnu: lightdm: Apply patch to fix a problem with VNC integration., guix-commits, 2022/08/28
- 11/13: marionette: Improve the error message of 'wait-for-screen-text'.,
guix-commits <=