From dcafee55a580430b17ca237799a4eff245919c3b Mon Sep 17 00:00:00 2001 From: Valentino Geron Date: Wed, 3 Aug 2022 12:11:32 +0300 Subject: [PATCH] Fix acl tests to support `--singledb` flag (#11077) * some of the tests don't clean the key the use * marked tests with `{singledb:skip}` if they use SELECT Co-authored-by: Valentino Geron --- tests/unit/acl.tcl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/unit/acl.tcl b/tests/unit/acl.tcl index 5f4be1888..3a1dcbf6c 100644 --- a/tests/unit/acl.tcl +++ b/tests/unit/acl.tcl @@ -383,7 +383,8 @@ start_server {tags {"acl external:skip"}} { } {} test {ACLs including of a type includes also subcommands} { - r ACL setuser newuser -@all +acl +@stream + r ACL setuser newuser -@all +del +acl +@stream + r DEL key r XADD key * field value r XINFO STREAM key } @@ -395,10 +396,11 @@ start_server {tags {"acl external:skip"}} { r SELECT 0 catch {r SELECT 1} e set e - } {*NOPERM*select*} + } {*NOPERM*select*} {singledb:skip} test {ACLs can block all DEBUG subcommands except one} { - r ACL setuser newuser -@all +acl +incr +debug|object + r ACL setuser newuser -@all +acl +del +incr +debug|object + r DEL key set cmdstr [dict get [r ACL getuser newuser] commands] assert_match {*+debug|object*} $cmdstr r INCR key