diff options
| author | Artyom V. Poptsov <poptsov.artyom@gmail.com> | 2016-11-24 23:03:27 +0300 |
|---|---|---|
| committer | Artyom V. Poptsov <poptsov.artyom@gmail.com> | 2016-11-26 00:39:34 +0300 |
| commit | 6e9d37989504d2a42b313b3cd4d7dbd7971e7093 (patch) | |
| tree | cd17196965a1f9ada1b6a5df1ff77e3b524025cf | |
| parent | channel.scm (channel-get-stream, channel-get-session): Deprecate (diff) | |
| download | guile-ssh-6e9d37989504d2a42b313b3cd4d7dbd7971e7093.tar.gz | |
tests/{client-server,key}.scm: Don't use deprecated procedures
* tests/client-server.scm ("get-public-key-hash"): Rename to
"public-key-hash". Don't use deprecated procedures.
("channel-get-session"): Rename to "channel-session". Don't use deprecated
procedures.
* tests/key.scm ("get-key-type"): Rename to "key-type". Don't use deprecated
procedures.
| -rw-r--r-- | tests/client-server.scm | 10 | ||||
| -rw-r--r-- | tests/key.scm | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/client-server.scm b/tests/client-server.scm index b56a329..ae25039 100644 --- a/tests/client-server.scm +++ b/tests/client-server.scm @@ -112,7 +112,7 @@ (delete-file %knownhosts) res)))) -(test-assert-with-log "get-public-key-hash" +(test-assert-with-log "public-key-hash" (run-client-test ;; server @@ -129,8 +129,8 @@ (connect! session) (authenticate-server session) (let* ((pubkey (get-server-public-key session)) - (md5-res (get-public-key-hash pubkey 'md5)) - (sha1-res (get-public-key-hash pubkey 'sha1))) + (md5-res (public-key-hash pubkey 'md5)) + (sha1-res (public-key-hash pubkey 'sha1))) (disconnect! session) (and (bytevector=? md5-res hash-md5-bv) (string=? (bytevector->hex-string md5-res) hash-md5-str) @@ -519,7 +519,7 @@ (call-with-connected-session/channel-test make-channel)))) -(test-assert-with-log "channel-get-session" +(test-assert-with-log "channel-session" (run-client-test ;; server @@ -531,7 +531,7 @@ (call-with-connected-session/channel-test (lambda (session) (let ((channel (make-channel session))) - (eq? session (channel-get-session channel)))))))) + (eq? session (channel-session channel)))))))) (test-assert-with-log "channel-open-session" (run-client-test diff --git a/tests/key.scm b/tests/key.scm index 4c91a2c..48dd757 100644 --- a/tests/key.scm +++ b/tests/key.scm @@ -87,11 +87,11 @@ (when-openssl (private-key->public-key *ecdsa-key*)))) -(test-assert-with-log "get-key-type" - (and (eq? 'rsa (get-key-type *rsa-key*)) - (eq? 'dss (get-key-type *dsa-key*)) +(test-assert-with-log "key-type" + (and (eq? 'rsa (key-type *rsa-key*)) + (eq? 'dss (key-type *dsa-key*)) (when-openssl - (eq? 'ecdsa (get-key-type *ecdsa-key*))))) + (eq? 'ecdsa (key-type *ecdsa-key*))))) (test-assert-with-log "private-key-to-file" |