<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20825">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sysmocom: emergency_preemptive_call.py: Avoid test failure if 2nd call not fully established<br><br>It may happen that the non-emergency call MT leg is still not properly<br>released when the emergency call MT leg is to be assigned a TCH, meaning<br>BSC will fail with an Assignment Failure upon Assignment request from<br>MSC.<br>The test sometimes passed and sometimes didn't, due to above mentioned<br>race condition. Let's relax a bit the test expectancies to have it<br>always passing, while still verifying preemption happens, and MT phone<br>is reached.<br><br>Related: OS#4549<br>Change-Id: I3697227cac56a1327f9ea08c5c2f52568e8d2a8a<br>---<br>M src/osmo_gsm_tester/obj/ms_ofono.py<br>M sysmocom/suites/emergency/emergency_preemptive_call.py<br>2 files changed, 18 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/ms_ofono.py b/src/osmo_gsm_tester/obj/ms_ofono.py</span><br><span>index a5ee3ea..c709f31 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_ofono.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_ofono.py</span><br><span>@@ -773,6 +773,15 @@</span><br><span> MainLoop.wait(lambda: self._find_call_msisdn_state(caller_msisdn, 'incoming') is not None, timeout=timeout)</span><br><span> return self._find_call_msisdn_state(caller_msisdn, 'incoming')</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def call_wait_dialing(self, caller_msisdn_or_modem, timeout=60):</span><br><span style="color: hsl(120, 100%, 40%);">+ if isinstance(caller_msisdn_or_modem, Modem):</span><br><span style="color: hsl(120, 100%, 40%);">+ caller_msisdn = caller_msisdn_or_modem.msisdn()</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ caller_msisdn = str(caller_msisdn_or_modem)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('Waiting for dialing call from:', caller_msisdn)</span><br><span style="color: hsl(120, 100%, 40%);">+ MainLoop.wait(lambda: self._find_call_msisdn_state(caller_msisdn, 'dialing') is not None, timeout=timeout)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._find_call_msisdn_state(caller_msisdn, 'dialing')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def call_answer(self, call_id):</span><br><span> self.dbg('Answer call %s' % call_id)</span><br><span> assert self.call_state(call_id) == 'incoming'</span><br><span>diff --git a/sysmocom/suites/emergency/emergency_preemptive_call.py b/sysmocom/suites/emergency/emergency_preemptive_call.py</span><br><span>index b4fba4b..7e76a31 100755</span><br><span>--- a/sysmocom/suites/emergency/emergency_preemptive_call.py</span><br><span>+++ b/sysmocom/suites/emergency/emergency_preemptive_call.py</span><br><span>@@ -80,20 +80,16 @@</span><br><span> assert len(emerg_numbers) > 0</span><br><span> print('dialing Emergency Number %s' % (emerg_numbers[0]))</span><br><span> mo_cid_emerg = ms_mo_emerg.call_dial(emerg_numbers[0])</span><br><span style="color: hsl(0, 100%, 40%);">-mt_cid_emerg = ms_mt_emerg.call_wait_incoming(ms_mo_emerg)</span><br><span style="color: hsl(120, 100%, 40%);">+# In here we'd ideally wait for incoming call and accept it, but there may be a</span><br><span style="color: hsl(120, 100%, 40%);">+# race condition in previous MT TCH not being yet released, so BSC will only be</span><br><span style="color: hsl(120, 100%, 40%);">+# able to allocate a SDCCH for not a TCH, and will fail later with Assignment</span><br><span style="color: hsl(120, 100%, 40%);">+# Failure:</span><br><span style="color: hsl(120, 100%, 40%);">+mt_cid_emerg = ms_mt_emerg.call_wait_dialing(ms_mo_emerg)</span><br><span> print('dial success')</span><br><span style="color: hsl(0, 100%, 40%);">-assert not ms_mo_emerg.call_is_active(mo_cid_emerg) and not ms_mt_emerg.call_is_active(mt_cid_emerg)</span><br><span style="color: hsl(0, 100%, 40%);">-ms_mt_emerg.call_answer(mt_cid_emerg)</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms_mo_emerg.call_is_active, mo_cid_emerg)</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ms_mt_emerg.call_is_active, mt_cid_emerg)</span><br><span style="color: hsl(0, 100%, 40%);">-print('answer success, call established and ongoing')</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+assert ms_mo_emerg.call_state(mo_cid_emerg) == 'alerting'</span><br><span> # Now the emergency call is ongoing, and the previous one should have been gone:</span><br><span style="color: hsl(0, 100%, 40%);">-assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0</span><br><span style="color: hsl(120, 100%, 40%);">+wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+print('preemption worked')</span><br><span> </span><br><span> sleep(5) # maintain the emergency call active for 5 seconds</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-assert ms_mo_emerg.call_is_active(mo_cid_emerg) and ms_mt.call_is_active(mt_cid_emerg)</span><br><span style="color: hsl(0, 100%, 40%);">-ms_mt_emerg.call_hangup(mt_cid_emerg)</span><br><span style="color: hsl(0, 100%, 40%);">-wait(lambda: len(ms_mo_emerg.call_id_list()) == 0 and len(ms_mt_emerg.call_id_list()) == 0)</span><br><span style="color: hsl(0, 100%, 40%);">-print('hangup success')</span><br><span style="color: hsl(120, 100%, 40%);">+print('done sleepig, success')</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20825">change 20825</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20825"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3697227cac56a1327f9ea08c5c2f52568e8d2a8a </div>
<div style="display:none"> Gerrit-Change-Number: 20825 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>