Fix TCL tmp dir leak in the ACL load test (#1895)

enjoy-binbin · web-flow · commit ea2e48a807e1 · 2025-03-28T10:28:50.000-07:00
Signed-off-by: Binbin &lt;binloveplay1314@qq.com&gt;
diff --git a/tests/unit/acl.tcl b/tests/unit/acl.tcl
@@ -1307,19 +1307,21 @@ tags {acl external:skip} {
     }
 }
 
-set server_path [tmpdir "acl"]
+set server_path [tmpdir "server.acl"]
 exec cp -f tests/assets/user.acl $server_path
 start_server [list overrides [list "dir" $server_path "aclfile" "user.acl"] tags {"repl external:skip"}] {
     set primary [srv 0 client]
     set primary_host [srv 0 host]
     set primary_port [srv 0 port]
+
     test "Test ACL LOAD works on primary" {
         exec cp -f tests/assets/user.acl $server_path
         $primary ACL setuser harry on nopass resetchannels &test +@all ~*
         $primary ACL save
         $primary ACL load
         $primary AUTH harry anything
     }
+
     start_server [list overrides [list "dir" $server_path "aclfile" "user.acl"]] {
         set replica [srv 0 client]
         $replica replicaof $primary_host $primary_port
@@ -1342,4 +1344,3 @@ start_server [list overrides [list "dir" $server_path "aclfile" "user.acl"] tags
         }
     }
 }
-

Original file line number	Diff line number	Diff line change
`@@ -1307,19 +1307,21 @@ tags {acl external:skip} {`
`1307`	`1307`	`}`
`1308`	`1308`	`}`
`1309`	`1309`
`1310`		`-set server_path [tmpdir "acl"]`
	`1310`	`+set server_path [tmpdir "server.acl"]`
`1311`	`1311`	`exec cp -f tests/assets/user.acl $server_path`
`1312`	`1312`	`start_server [list overrides [list "dir" $server_path "aclfile" "user.acl"] tags {"repl external:skip"}] {`
`1313`	`1313`	`set primary [srv 0 client]`
`1314`	`1314`	`set primary_host [srv 0 host]`
`1315`	`1315`	`set primary_port [srv 0 port]`
	`1316`	`+`
`1316`	`1317`	`test "Test ACL LOAD works on primary" {`
`1317`	`1318`	`exec cp -f tests/assets/user.acl $server_path`
`1318`	`1319`	`$primary ACL setuser harry on nopass resetchannels &test +@all ~*`
`1319`	`1320`	`$primary ACL save`
`1320`	`1321`	`$primary ACL load`
`1321`	`1322`	`$primary AUTH harry anything`
`1322`	`1323`	`}`
	`1324`	`+`
`1323`	`1325`	`start_server [list overrides [list "dir" $server_path "aclfile" "user.acl"]] {`
`1324`	`1326`	`set replica [srv 0 client]`
`1325`	`1327`	`$replica replicaof $primary_host $primary_port`
`@@ -1342,4 +1344,3 @@ start_server [list overrides [list "dir" $server_path "aclfile" "user.acl"] tags`
`1342`	`1344`	`}`
`1343`	`1345`	`}`
`1344`	`1346`	`}`
`1345`		`-`