[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/05: tests: ssh: Generalize.
From: |
Ludovic Courtès |
Subject: |
03/05: tests: ssh: Generalize. |
Date: |
Mon, 3 Oct 2016 13:26:37 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit 0e59885060df92bcfb1ee765dfbfdcf26dd67e08
Author: Ludovic Courtès <address@hidden>
Date: Mon Oct 3 15:14:46 2016 +0200
tests: ssh: Generalize.
* gnu/tests/ssh.scm (%openssh-os): Rename to...
(%base-os): ... this.
[services]: Remove 'openssh-service-type' instance.
(os-with-service): New procedure.
(run-openssh-test): Rename to...
(run-ssh-test): ... this. Add 'ssh-service' and 'pid-file' parameters.
Use 'os-with-service' to add SSH-SERVICE to %BASE-OS. Honor PID-FILE.
(%test-openssh): Adjust accordingly.
---
gnu/tests/ssh.scm | 39 +++++++++++++++++++++++++--------------
1 file changed, 25 insertions(+), 14 deletions(-)
diff --git a/gnu/tests/ssh.scm b/gnu/tests/ssh.scm
index a9592d9..bcf7c97 100644
--- a/gnu/tests/ssh.scm
+++ b/gnu/tests/ssh.scm
@@ -33,7 +33,7 @@
#:use-module (guix monads)
#:export (%test-openssh))
-(define %openssh-os
+(define %base-os
(operating-system
(host-name "komputilo")
(timezone "Europe/Berlin")
@@ -43,18 +43,22 @@
(file-systems %base-file-systems)
(firmware '())
(users %base-user-accounts)
+ (services (cons (dhcp-client-service)
+ %base-services))))
- ;; Allow root logins with an empty password to simplify testing.
- (services (cons* (service openssh-service-type
- (openssh-configuration
- (permit-root-login #t)
- (allow-empty-passwords? #t)))
- (dhcp-client-service)
- %base-services))))
-
-(define (run-openssh-test name)
+(define (os-with-service service)
+ "Return a test operating system that runs SERVICE."
+ (operating-system
+ (inherit %base-os)
+ (services (cons service
+ (operating-system-user-services %base-os)))))
+
+(define (run-ssh-test name ssh-service pid-file)
+ "Run a test of an OS running SSH-SERVICE, which writes its PID to PID-FILE.
+SSH-SERVICE must be configured to listen on port 22 and to allow for root and
+empty-password logins."
(mlet* %store-monad ((os -> (marionette-operating-system
- %openssh-os
+ (os-with-service ssh-service)
#:imported-modules '((gnu services herd)
(guix combinators))))
(command (system-qemu-image/shared-store-script
@@ -98,7 +102,7 @@
(mkdir #$output)
(chdir #$output)
- (test-begin "openssh")
+ (test-begin "ssh-daemon")
;; Wait for sshd to be up and running.
(test-eq "service running"
@@ -112,7 +116,7 @@
;; Check sshd's PID file.
(test-equal "sshd PID"
- (wait-for-file "/var/run/sshd.pid")
+ (wait-for-file #$pid-file)
(marionette-eval
'(begin
(use-modules (gnu services herd)
@@ -155,4 +159,11 @@
(system-test
(name "openssh")
(description "Connect to a running OpenSSH daemon.")
- (value (run-openssh-test name))))
+ (value (run-ssh-test name
+ ;; Allow root logins with an empty password to
+ ;; simplify testing.
+ (service openssh-service-type
+ (openssh-configuration
+ (permit-root-login #t)
+ (allow-empty-passwords? #t)))
+ "/var/run/sshd.pid"))))