summaryrefslogtreecommitdiff
path: root/gnu/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-06-05 22:30:18 +0200
committerLudovic Courtès <ludo@gnu.org>2022-06-05 23:35:30 +0200
commit1fc4d821eb3b34e06b217e94f400e13d8030e7b9 (patch)
treeec3d9b56f3af4620ca28d503884499877e8a94b4 /gnu/tests
parent8ccf5f518d9a3fd754dcfa3e9ecddcec874f575c (diff)
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.
Diffstat (limited to 'gnu/tests')
-rw-r--r--gnu/tests/virtualization.scm12
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm
index 628cd0549b..0453f38e5e 100644
--- a/gnu/tests/virtualization.scm
+++ b/gnu/tests/virtualization.scm
@@ -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 @@
(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 @@
(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 @@
(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))))