diff options
| author | Artyom Poptsov <poptsov.artyom@gmail.com> | 2014-01-28 10:31:47 +0400 |
|---|---|---|
| committer | Artyom Poptsov <poptsov.artyom@gmail.com> | 2014-01-28 10:31:47 +0400 |
| commit | eec26866ccb9c650d21bb954245c31bf4833354b (patch) | |
| tree | cc555e876faf8b30dfa4ad1d351481bfffc03a1d | |
| parent | Merge branch 'master' into tests-implementation (diff) | |
| download | guile-ssh-eec26866ccb9c650d21bb954245c31bf4833354b.tar.gz | |
tests/: Update TCs to use symbols for `log-verbosity' option.
* tests/client-server.scm ("connect"): Update test to use symbols
for setting log levels.
* tests/server.scm ("server-set!, valid values"): Likewise.
("server-set!, invalid values"): Likewise.
("make-server"): Likewise.
("server-listen"): Likewise.
* tests/session.scm ("session-set!, valid values"): Likewise.
("session-set!, invalid values"): Update `log-verbosity' data set
for the test.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | tests/client-server.scm | 4 | ||||
| -rw-r--r-- | tests/server.scm | 8 | ||||
| -rw-r--r-- | tests/session.scm | 5 |
4 files changed, 19 insertions, 8 deletions
@@ -1,5 +1,15 @@ 2014-01-28 Artyom Poptsov <poptsov.artyom@gmail.com> + * tests/client-server.scm ("connect"): Update test to use symbols + for setting log levels. + * tests/server.scm ("server-set!, valid values"): Likewise. + ("server-set!, invalid values"): Likewise. + ("make-server"): Likewise. + ("server-listen"): Likewise. + * tests/session.scm ("session-set!, valid values"): Likewise. + ("session-set!, invalid values"): Update `log-verbosity' data set + for the test. + * src/server-func.c (set_option) [SSH_BIND_OPTIONS_LOG_VERBOSITY]: Use symbols to represent log levels instead of numbers. All callers updated. diff --git a/tests/client-server.scm b/tests/client-server.scm index f79bb2f..27ed4f7 100644 --- a/tests/client-server.scm +++ b/tests/client-server.scm @@ -41,12 +41,12 @@ #:port port #:timeout 10 ;seconds #:user "Random J. User" - #:log-verbosity 4)) + #:log-verbosity 'nolog)) (server (make-server #:bindaddr addr #:bindport port #:rsakey rsakey - #:log-verbosity 4))) + #:log-verbosity 'nolog))) (server-listen server) diff --git a/tests/server.scm b/tests/server.scm index 364438d..ee6f124 100644 --- a/tests/server.scm +++ b/tests/server.scm @@ -44,7 +44,7 @@ (rsakey ,(format #f "~a/tests/rsakey" topdir)) (dsakey ,(format #f "~a/tests/dsakey" topdir)) (banner "string") - (log-verbosity 0 1 2 3 4 0) + (log-verbosity nolog rare protocol packet functions) (blocking-mode #f #t))) (log (test-runner-aux-value (test-runner-current))) (res #t)) @@ -73,7 +73,7 @@ (rsakey "I'm not a RSA key" 42) (dsakey "I'm not a DSA key" 42) (banner 12345) - (log-verbosity -1 5) + (log-verbosity -1 0 1 2 3 4 5) (blocking-mode 42 "string"))) (log (test-runner-aux-value (test-runner-current))) (res #t)) @@ -101,7 +101,7 @@ #:rsakey (format #f "~a/tests/rsakey" topdir) #:dsakey (format #f "~a/tests/dsakey" topdir) #:banner "banner" - #:log-verbosity 1 + #:log-verbosity 'nolog #:blocking-mode #f))) (test-assert "server-listen" @@ -109,7 +109,7 @@ (server (make-server #:bindaddr "127.0.0.1" #:bindport 123456 #:rsakey (format #f "~a/tests/rsakey" topdir) - #:log-verbosity 1))) + #:log-verbosity 'nolog))) (server-listen server) #t)) diff --git a/tests/session.scm b/tests/session.scm index 9eccb6a..becf7d9 100644 --- a/tests/session.scm +++ b/tests/session.scm @@ -45,7 +45,8 @@ (timeout-usec 15000) ;milliseconds (ssh1 #f #t) (ssh2 #f #t) - (log-verbosity 0 1 2 3 4 0) + (log-verbosity nolog rare protocol packet functions + nolog) (compression "yes" "no") (compression-level 1 2 3 4 5 6 7 8 9))) (res #t)) @@ -68,7 +69,7 @@ (timeout-usec "string" -15000) (ssh1 12345 "string") (ssh2 12345 "string") - (log-verbosity "string" -1 5) + (log-verbosity "string" -1 0 1 2 3 4 5) (compression 12345) (compression-level -1 0 10))) (res #t)) |