diff options
| author | Clément Lassieur <clement@lassieur.org> | 2017-03-19 13:20:11 +0100 |
|---|---|---|
| committer | Clément Lassieur <clement@lassieur.org> | 2017-03-21 20:49:26 +0100 |
| commit | 36f666c63dfd684d965df71b74c4166d3b627373 (patch) | |
| tree | b3b41e75743c7c839e4aed0635ff2c279f3a5d4f | |
| parent | cfaf4d11659a6b78ef35676b4e37d6da179e5b51 (diff) | |
| download | patches-36f666c63dfd684d965df71b74c4166d3b627373.tar patches-36f666c63dfd684d965df71b74c4166d3b627373.tar.gz | |
tests: ssh: Add a test for SFTP.
* gnu/tests/ssh.scm (run-ssh-test): Introduce "SFTP file writing and reading".
Make 'sftp?' a keyword parameter.
(%test-openssh): Pass #:sftp? #t to 'run-ssh-test'.
| -rw-r--r-- | gnu/tests/ssh.scm | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/gnu/tests/ssh.scm b/gnu/tests/ssh.scm index 7779b71561..c1582c4737 100644 --- a/gnu/tests/ssh.scm +++ b/gnu/tests/ssh.scm @@ -55,10 +55,12 @@ (services (cons service (operating-system-user-services %base-os))))) -(define (run-ssh-test name ssh-service pid-file) +(define* (run-ssh-test name ssh-service pid-file #:key (sftp? #f)) "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." +empty-password logins. + +When SFTP? is true, run an SFTP server test." (mlet* %store-monad ((os -> (marionette-operating-system (os-with-service ssh-service) #:imported-modules '((gnu services herd) @@ -81,7 +83,8 @@ empty-password logins." (ice-9 match) (ssh session) (ssh auth) - (ssh channel)) + (ssh channel) + (ssh sftp)) (define marionette ;; Enable TCP forwarding of the guest's port 22. @@ -187,6 +190,21 @@ root with an empty password." (and (zero? (channel-get-exit-status channel)) (wait-for-file "/root/witness")))))) + ;; Connect to the guest over SFTP. Make sure we can write and + ;; read a file there. + (unless #$sftp? + (test-skip 1)) + (test-equal "SFTP file writing and reading" + 'hello + (call-with-connected-session/auth + (lambda (session) + (let ((sftp-session (make-sftp-session session)) + (witness "/root/sftp-witness")) + (call-with-remote-output-file sftp-session witness + (cut display "hello" <>)) + (call-with-remote-input-file sftp-session witness + read))))) + (test-end) (exit (= (test-runner-fail-count (test-runner-current)) 0))))) @@ -203,7 +221,8 @@ root with an empty password." (openssh-configuration (permit-root-login #t) (allow-empty-passwords? #t))) - "/var/run/sshd.pid")))) + "/var/run/sshd.pid" + #:sftp? #t)))) (define %test-dropbear (system-test |