diff options
| author | Itamar Haber <itamar@redislabs.com> | 2020-07-10 16:22:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-10 16:22:58 +0300 |
| commit | a6504a16f70511c06bd5460b7cdfee6247cb09a6 (patch) | |
| tree | ed0a47f5c181e8bfc046d0d9bd6b7da64cf98e0a /tests/unit/introspection.tcl | |
| parent | 91d309681cf9db8c3b8d4f2d828c336cff661efb (diff) | |
| parent | d5648d617e1ed5b9cfa575ad412bc9d450b16afd (diff) | |
| download | redis-conduct.tar.gz | |
Merge branch 'unstable' into conductconduct
Diffstat (limited to 'tests/unit/introspection.tcl')
| -rw-r--r-- | tests/unit/introspection.tcl | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/tests/unit/introspection.tcl b/tests/unit/introspection.tcl index b60ca0d48..d681e06d5 100644 --- a/tests/unit/introspection.tcl +++ b/tests/unit/introspection.tcl @@ -78,17 +78,8 @@ start_server {tags {"introspection"}} { syslog-facility databases port - io-threads tls-port - tls-prefer-server-ciphers - tls-cert-file - tls-key-file - tls-dh-params-file - tls-ca-cert-file - tls-ca-cert-dir - tls-protocols - tls-ciphers - tls-ciphersuites + io-threads logfile unixsocketperm slaveof @@ -100,6 +91,23 @@ start_server {tags {"introspection"}} { bgsave_cpulist } + if {!$::tls} { + append skip_configs { + tls-prefer-server-ciphers + tls-session-cache-timeout + tls-session-cache-size + tls-session-caching + tls-cert-file + tls-key-file + tls-dh-params-file + tls-ca-cert-file + tls-ca-cert-dir + tls-protocols + tls-ciphers + tls-ciphersuites + } + } + set configs {} foreach {k v} [r config get *] { if {[lsearch $skip_configs $k] != -1} { |