Make sure CSIP discovery events are unique

CSIP sirk events were not cleared after discovery, causing some
test-cases to incorrectly assume all lower-testers were discovered when
in fact they were not. This commit fixes this issue.

The discovery for CSIP/CL/SP/BV-06-C under WID 20107 is the only exception,
since this tests retrieves data directly from the SIRK event queue later
during the handling of WID 13.

Author: Frodevan

autopts/wid/csip.py

@@ -102,7 +102,7 @@ def hdl_wid_11(_: WIDParams):
     addr = btp.pts_addr_get()
 
     btp.csip_discover(addr_type, addr)
-    ev = stack.csip.wait_sirk_ev(addr_type, addr, 30, remove=False)
+    ev = stack.csip.wait_sirk_ev(addr_type, addr, 30)
     if ev is None:
         return False
 
@@ -190,7 +190,7 @@ def hdl_wid_20100(params: WIDParams):
             'CSIP/CL/SPE/BI-02-C' in params.test_case_name or\
             'CSIP/CL/SPE/BI-03-C' in params.test_case_name:
         btp.csip_discover(addr_type, addr)
-        ev = stack.csip.wait_sirk_ev(addr_type, addr, 30, remove=False)
+        ev = stack.csip.wait_sirk_ev(addr_type, addr, 30)
         if ev is None:
             return False
         stack.csip.member_cnt += 1
@@ -215,7 +215,7 @@ def hdl_wid_20101(params: WIDParams):
         addr = btp.pts_addr_get()
 
     btp.csip_discover(addr_type, addr)
-    ev = stack.csip.wait_sirk_ev(addr_type, addr, 30, remove=False)
+    ev = stack.csip.wait_sirk_ev(addr_type, addr, 30)
     if ev is None:
         return False
 
@@ -236,7 +236,7 @@ def hdl_wid_20103(_: WIDParams):
     addr = btp.pts_addr_get()
 
     btp.csip_discover(addr_type, addr)
-    ev = stack.csip.wait_sirk_ev(addr_type, addr, 30, remove=False)
+    ev = stack.csip.wait_sirk_ev(addr_type, addr, 30)
     if ev is None:
         return False
 
@@ -379,7 +379,7 @@ def hdl_wid_20116(params: WIDParams):
     addr = btp.pts_addr_get()
 
     btp.csip_discover(addr_type, addr)
-    ev = stack.csip.wait_sirk_ev(addr_type, addr, 30, remove=False)
+    ev = stack.csip.wait_sirk_ev(addr_type, addr, 30)
     if ev is None:
         return False