mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-19 14:07:01 +01:00
tests: childhurd: Generalize command execution over SSH.
* gnu/tests/virtualization.scm (run-childhurd-test)[run-uname-over-ssh]: Rename to... [run-command-over-ssh]: ... this. Add 'command' parameter and honor it. ["SSH up and running"]: Adjust accordingly.
This commit is contained in:
parent
8ccf5f518d
commit
1fc4d821eb
1 changed files with 6 additions and 6 deletions
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
|
||||
;;; Copyright © 2020, 2021 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2020-2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;;
|
||||
|
@ -151,8 +151,8 @@ (define vm
|
|||
(operating-system os)
|
||||
(memory-size (* 1024 3))))
|
||||
|
||||
(define run-uname-over-ssh
|
||||
;; Program that runs 'uname' over SSH and prints the result on standard
|
||||
(define (run-command-over-ssh . command)
|
||||
;; Program that runs COMMAND over SSH and prints the result on standard
|
||||
;; output.
|
||||
(let ()
|
||||
(define run
|
||||
|
@ -173,12 +173,12 @@ (define run
|
|||
(userauth-password! session "")
|
||||
(display
|
||||
(get-string-all
|
||||
(open-remote-input-pipe* session "uname" "-on"))))
|
||||
(open-remote-input-pipe* session #$@command))))
|
||||
(status
|
||||
(error "could not connect to childhurd over SSH"
|
||||
session status)))))))
|
||||
|
||||
(program-file "run-uname-over-ssh" run)))
|
||||
(program-file "run-command-over-ssh" run)))
|
||||
|
||||
(define test
|
||||
(with-imported-modules '((gnu build marionette))
|
||||
|
@ -242,7 +242,7 @@ (define marionette
|
|||
(use-modules (ice-9 popen))
|
||||
|
||||
(get-string-all
|
||||
(open-input-pipe #$run-uname-over-ssh)))
|
||||
(open-input-pipe #$(run-command-over-ssh "uname" "-on"))))
|
||||
marionette))
|
||||
|
||||
(test-end))))
|
||||
|
|
Loading…
Reference in a new issue