diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-10-12 14:33:56 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-10-12 14:36:44 +0300 |
| commit | 322917aeb8e672c21378fd371a5cff4a9f0c2520 (patch) | |
| tree | 70229faa39f14caa09b769153453c3898f64f7fc /gnu/tests/base.scm | |
| parent | 407f017663c97ebfe48e3cb304bf97bf2557f83f (diff) | |
| parent | e1baf802ccd8af4f7b416b0987db706f2dbfc42f (diff) | |
| download | guix-322917aeb8e672c21378fd371a5cff4a9f0c2520.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: gnu/packages/gnuzilla.scm gnu/packages/graphics.scm gnu/packages/gstreamer.scm gnu/packages/gtk.scm gnu/packages/kde-frameworks.scm gnu/packages/video.scm
Diffstat (limited to 'gnu/tests/base.scm')
| -rw-r--r-- | gnu/tests/base.scm | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 636b127fb8..64cd6a911a 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> +;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -509,18 +510,18 @@ info --version") (file-exists? capture)))) (test-assert "screen text" - (let ((text (marionette-screen-text marionette - #:ocr - #$(file-append ocrad - "/bin/ocrad")))) - ;; Check whether the welcome message and shell prompt are - ;; displayed. Note: OCR confuses "y" and "V" for instance, so - ;; we cannot reliably match the whole text. - (and (string-contains text "This is the GNU") - (string-contains text - (string-append - "root@" - #$(operating-system-host-name os)))))) + (wait-for-screen-text + marionette + (lambda (text) + ;; Check whether the welcome message and shell prompt are + ;; displayed. Note: OCR confuses "y" and "V" for instance, so + ;; we cannot reliably match the whole text. + (and (string-contains text "This is the GNU") + (string-contains text + (string-append + "root@" + #$(operating-system-host-name os))))) + #:ocr #$(file-append ocrad "/bin/ocrad"))) (test-end)))) |