diff options
Diffstat (limited to 'gnu/tests/ssh.scm')
| -rw-r--r-- | gnu/tests/ssh.scm | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/gnu/tests/ssh.scm b/gnu/tests/ssh.scm index 3f550db5ea..4882c7a88b 100644 --- a/gnu/tests/ssh.scm +++ b/gnu/tests/ssh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016-2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016-2022, 2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; @@ -124,13 +124,22 @@ root with an empty password." (let ((pid (marionette-eval '(begin (use-modules (gnu services herd) - (srfi srfi-1)) + (srfi srfi-1) + (ice-9 match)) - (live-service-running - (find (lambda (live) - (memq 'ssh-daemon - (live-service-provision live))) - (current-services)))) + (match (live-service-running + (find (lambda (live) + (memq 'ssh-daemon + (live-service-provision live))) + (current-services))) + ((? number? pid) + ;; shepherd < 1.0.0 + pid) + (('inetd-service _ ...) + #t) + (('process ('version 0 _ ...) + ('id pid) _ ...) + pid))) marionette))) (if #$pid-file (= pid (wait-for-file #$pid-file marionette)) |