commit d2c266cbe93d35b070651f8a0d249459e3cde0df
author Jimi Chen <jimictw@google.com> Fri Mar 21 06:31:49 2025 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 21 06:31:49 2025 -0700
tree ac6b161b4ecee3c167c7d0e2ce5c96630f46ece3
parent ed52d9aee3a6ceeabff6007e56113d4933a2cffa
parent 8e3bf62c7437cbbe870655b689167bf524af153d

Merge "Add multicast address cleanup for test failures" into main

tests/cts/multidevices/apfv6_test.py

diff --git a/tests/cts/multidevices/apfv6_test.py b/tests/cts/multidevices/apfv6_test.py
index 2404966..9b2e309 100644
--- a/tests/cts/multidevices/apfv6_test.py
+++ b/tests/cts/multidevices/apfv6_test.py
@@ -190,15 +190,18 @@
 
         igmp = IGMPv3mr(records=mcast_records)
         expected_igmpv3_report = bytes(ether/ip/igmpv3_hdr/igmp).hex()
-        self.send_packet_and_expect_reply_received(
-            igmpv3_general_query, "DROPPED_IGMP_V3_GENERAL_QUERY_REPLIED", expected_igmpv3_report
-        )
-
-        for addr in mcast_addrs:
-            adb_utils.adb_shell(
-                self.clientDevice,
-                f'ip addr del {addr}/32 dev {self.client_iface_name}'
+        try:
+            self.send_packet_and_expect_reply_received(
+                igmpv3_general_query,
+                "DROPPED_IGMP_V3_GENERAL_QUERY_REPLIED",
+                expected_igmpv3_report
             )
+        finally:
+            for addr in mcast_addrs:
+                adb_utils.adb_shell(
+                    self.clientDevice,
+                    f'ip addr del {addr}/32 dev {self.client_iface_name}'
+                )
 
     @apf_utils.at_least_B()
     @apf_utils.apf_ram_at_least(3000)