Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
215c5eac
Commit
215c5eac
authored
Apr 27, 2022
by
Oran Agra
Browse files
Skip cluster test unit in TLS mode.
see
7d6744c7
parent
afb48c6c
Changes
1
Hide whitespace changes
Inline
Side-by-side
tests/support/server.tcl
View file @
215c5eac
...
@@ -160,12 +160,13 @@ proc server_is_up {host port retrynum} {
...
@@ -160,12 +160,13 @@ proc server_is_up {host port retrynum} {
# case err_return names a return variable for the message to be logged.
# case err_return names a return variable for the message to be logged.
proc tags_acceptable
{
err_return
}
{
proc tags_acceptable
{
err_return
}
{
upvar $err_return err
upvar $err_return err
set tags $::tags
# If tags are whitelisted, make sure there's match
# If tags are whitelisted, make sure there's match
if
{[
llength $::allowtags
]
> 0
}
{
if
{[
llength $::allowtags
]
> 0
}
{
set matched 0
set matched 0
foreach tag $::allowtags
{
foreach tag $::allowtags
{
if
{[
lsearch $
::
tags $tag
]
>= 0
}
{
if
{[
lsearch $tags $tag
]
>= 0
}
{
incr matched
incr matched
}
}
}
}
...
@@ -176,12 +177,27 @@ proc tags_acceptable {err_return} {
...
@@ -176,12 +177,27 @@ proc tags_acceptable {err_return} {
}
}
foreach tag $::denytags
{
foreach tag $::denytags
{
if
{[
lsearch $
::
tags $tag
]
>= 0
}
{
if
{[
lsearch $tags $tag
]
>= 0
}
{
set err
"Tag:
$tag
denied"
set err
"Tag:
$tag
denied"
return 0
return 0
}
}
}
}
if
{
$::external
&&
[
lsearch $tags
"external:skip"
]
>= 0
}
{
set err
"Not supported on external server"
return 0
}
if
{
$::singledb
&&
[
lsearch $tags
"singledb:skip"
]
>= 0
}
{
set err
"Not supported on singledb"
return 0
}
if
{
$::tls
&&
[
lsearch $tags
"tls:skip"
]
>= 0
}
{
set err
"Not supported in tls mode"
return 0
}
return 1
return 1
}
}
...
@@ -320,7 +336,9 @@ proc start_server {options {code undefined}} {
...
@@ -320,7 +336,9 @@ proc start_server {options {code undefined}} {
dict set srv
"port"
$::port
dict set srv
"port"
$::port
set client
[
redis $::host $::port 0 $::tls
]
set client
[
redis $::host $::port 0 $::tls
]
dict set srv
"client"
$client
dict set srv
"client"
$client
$client select 9
if
{
!$::singledb
}
{
$client select 9
}
set config
{}
set config
{}
dict set config
"port"
$::port
dict set config
"port"
$::port
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment