asterisk: Fix events in between unregistration procedure

Change-Id: I3c9cffa1756a87334e609e85a32509ed11f026c1
---
M asterisk/AMI_Functions.ttcn
M asterisk/Asterisk_Tests.ttcn
2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn
index d31d316..2acb876 100644
--- a/asterisk/AMI_Functions.ttcn
+++ b/asterisk/AMI_Functions.ttcn
@@ -757,9 +757,12 @@
 	f_ami_transceive_match_response_success(pt, ts_AMI_Action_PJSIPRegister(register, reg_action_id));
 }
 
-function f_ami_action_PJSIPUnregister(AMI_Msg_PT pt, charstring register) {
+function f_ami_action_PJSIPUnregister(AMI_Msg_PT pt,
+				      charstring register,
+				      boolean fail_others := true) {
 	var charstring reg_action_id := f_gen_action_id();
-	f_ami_transceive_match_response_success(pt, ts_AMI_Action_PJSIPUnregister(register, reg_action_id));
+	f_ami_transceive_match_response_success(pt, ts_AMI_Action_PJSIPUnregister(register, reg_action_id),
+						fail_others := fail_others);
 }
 
 function f_ami_action_AuthResponse_AUTS(AMI_Msg_PT pt,
diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn
index b7981eb..73e8183 100644
--- a/asterisk/Asterisk_Tests.ttcn
+++ b/asterisk/Asterisk_Tests.ttcn
@@ -428,10 +428,12 @@
 
 private function f_AMI_IMS_unregister(IMS_ConnHdlrPars pars) runs on test_CT
 {
-	f_ami_action_PJSIPUnregister(AMI_CLIENT, mp_volte_ims_outbound_registration);
-	AMI_CLIENT.receive(tr_AMI_Event_Registry(f_sip_SipAddr_to_str(pars.subscr.local_sip_record),
-						"sip:" & mp_ims_domain,
-						"Unregistered"));
+	f_ami_action_PJSIPUnregister(AMI_CLIENT, mp_volte_ims_outbound_registration, fail_others := false);
+	var template (present) AMI_Msg msg_expect :=
+		tr_AMI_Event_Registry(f_sip_SipAddr_to_str(pars.subscr.local_sip_record),
+				      "sip:" & mp_ims_domain,
+				      "Unregistered");
+	f_ami_wait_rx_msg(AMI_CLIENT, msg_expect, fail_others := false);
 }
 
 /* Test IMS registration of VoLTE UE */

