commit 9e0d56dd5e05b8c8206f95ee5dd3b1a7a20e73a5
author C Freeman <cecille@google.com> Thu Jun 08 21:04:03 2023 -0400
committer GitHub <noreply@github.com> Thu Jun 08 21:04:03 2023 -0400
tree 966a142d6459aaccc0f6d9abda451e4dc3b9dde7
parent 56a87346b158c166d3792098d41c13150cf8e70e

Fix cleanup steps for TC-ACE-1.3/4 (#27050)

* Fix cleanup steps for TC-ACE-1.3/4

* Whoops, missed a line.

src/python_testing/TC_ACE_1_3.py

diff --git a/src/python_testing/TC_ACE_1_3.py b/src/python_testing/TC_ACE_1_3.py
index 3fa0383..a24db8a 100644
--- a/src/python_testing/TC_ACE_1_3.py
+++ b/src/python_testing/TC_ACE_1_3.py
@@ -60,9 +60,7 @@
         logging.info('cat1v1 0x%x', cat1v1)
 
         self.print_step(1, "Commissioning, already done")
-        TH0 = self.default_controller
-        # _ = TH0 Hack for flake8 F841 local variable 'TH0' is assigned to but never used
-        _ = TH0
+
         fabric_admin = self.certificate_authority_manager.activeCaList[0].adminList[0]
 
         TH0_nodeid = self.matter_test_config.controller_node_id
@@ -343,7 +341,13 @@
 
         self.print_step(58, "TH0 writes ACL back to default")
 
-        acl = [TH0_admin_acl]
+        full_acl = Clusters.AccessControl.Structs.AccessControlEntryStruct(
+            privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kAdminister,
+            authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
+            subjects=[TH0_nodeid],
+            targets=[])
+
+        acl = [full_acl]
         await self.write_acl(acl)
 
 

src/python_testing/TC_ACE_1_4.py

diff --git a/src/python_testing/TC_ACE_1_4.py b/src/python_testing/TC_ACE_1_4.py
index 0878e7d..2808be4 100644
--- a/src/python_testing/TC_ACE_1_4.py
+++ b/src/python_testing/TC_ACE_1_4.py
@@ -336,13 +336,13 @@
         self.check_read_success(appcluster_wildcard, self.endpoint, self.cluster, self.attribute)
 
         self.print_step(48, "TH1 resets ACL")
-        descriptor_appendpoint_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(
-            privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
+        full_acl = Clusters.AccessControl.Structs.AccessControlEntryStruct(
+            privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kAdminister,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[self.matter_test_config.controller_node_id],
             targets=[])
 
-        acl = [admin_acl, descriptor_appendpoint_view]
+        acl = [full_acl]
         await self.write_acl(acl)