From 416defdc0ecd7134ceaeeb07d0a729540c4934c3 Mon Sep 17 00:00:00 2001 From: Binbin Date: Tue, 15 Oct 2024 10:30:03 +0800 Subject: [PATCH] Minor cleanups in acl-v2 tests (#1166) 1. Make sure to assert the ERR prefix. 2. Match "Syntax error*" in case of the message change. Signed-off-by: Binbin --- tests/unit/acl-v2.tcl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/unit/acl-v2.tcl b/tests/unit/acl-v2.tcl index a509bc0ff..e8229d1b3 100644 --- a/tests/unit/acl-v2.tcl +++ b/tests/unit/acl-v2.tcl @@ -42,19 +42,19 @@ start_server {tags {"acl external:skip"}} { test {Test selector syntax error reports the error in the selector context} { catch {r ACL SETUSER selector-syntax on (this-is-invalid)} e - assert_match "*ERR Error in ACL SETUSER modifier '(*)*Syntax*" $e + assert_match "ERR Error in ACL SETUSER modifier '(*)*Syntax*" $e catch {r ACL SETUSER selector-syntax on (&* &fail)} e - assert_match "*ERR Error in ACL SETUSER modifier '(*)*Adding a pattern after the*" $e + assert_match "ERR Error in ACL SETUSER modifier '(*)*Adding a pattern after the*" $e catch {r ACL SETUSER selector-syntax on (+PING (+SELECT (+DEL} e - assert_match "*ERR Unmatched parenthesis in acl selector*" $e + assert_match "ERR Unmatched parenthesis in acl selector*" $e catch {r ACL SETUSER selector-syntax on (+PING (+SELECT (+DEL ) ) ) } e - assert_match "*ERR Error in ACL SETUSER modifier*" $e + assert_match "ERR Error in ACL SETUSER modifier*" $e catch {r ACL SETUSER selector-syntax on (+PING (+SELECT (+DEL ) } e - assert_match "*ERR Error in ACL SETUSER modifier*" $e + assert_match "ERR Error in ACL SETUSER modifier*" $e assert_equal "" [r ACL GETUSER selector-syntax] } @@ -75,11 +75,11 @@ start_server {tags {"acl external:skip"}} { # Test invalid selector syntax catch {r ACL SETUSER invalid-selector " () "} err - assert_match "*ERR*Syntax error*" $err + assert_match "ERR*Syntax error*" $err catch {r ACL SETUSER invalid-selector (} err - assert_match "*Unmatched parenthesis*" $err + assert_match "ERR*Unmatched parenthesis*" $err catch {r ACL SETUSER invalid-selector )} err - assert_match "*ERR*Syntax error" $err + assert_match "ERR*Syntax error*" $err } test {Test separate read permission} {