Unverified Commit b9656adb authored by sundb's avatar sundb Committed by GitHub
Browse files

Restore ::singledb after cluster test (#10441)

When ::singledb is 0, we will use db 9 for the test db.
Since ::singledb is set to 1 in the cluster-related tests, but not restored, some subsequent
tests associated with db 9 will fail.
parent b69636d3
...@@ -19,6 +19,7 @@ proc csi {args} { ...@@ -19,6 +19,7 @@ proc csi {args} {
} }
# make sure the test infra won't use SELECT # make sure the test infra won't use SELECT
set old_singledb $::singledb
set ::singledb 1 set ::singledb 1
# cluster creation is complicated with TLS, and the current tests don't really need that coverage # cluster creation is complicated with TLS, and the current tests don't really need that coverage
...@@ -285,3 +286,5 @@ test {Migrate the last slot away from a node using redis-cli} { ...@@ -285,3 +286,5 @@ test {Migrate the last slot away from a node using redis-cli} {
} }
} ;# tags } ;# tags
set ::singledb $old_singledb
...@@ -22,6 +22,7 @@ set testmodule [file normalize tests/modules/blockonkeys.so] ...@@ -22,6 +22,7 @@ set testmodule [file normalize tests/modules/blockonkeys.so]
set testmodule_nokey [file normalize tests/modules/blockonbackground.so] set testmodule_nokey [file normalize tests/modules/blockonbackground.so]
# make sure the test infra won't use SELECT # make sure the test infra won't use SELECT
set old_singledb $::singledb
set ::singledb 1 set ::singledb 1
# cluster creation is complicated with TLS, and the current tests don't really need that coverage # cluster creation is complicated with TLS, and the current tests don't really need that coverage
...@@ -202,4 +203,6 @@ start_server [list overrides $base_conf] { ...@@ -202,4 +203,6 @@ start_server [list overrides $base_conf] {
} }
} }
} ;# tags } ;# tags
\ No newline at end of file
set ::singledb $old_singledb
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment