<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26303">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stp: Drop mp_osmo_stp_newer_than_1_4_0<br><br>osmo-stp 1.5.0 has been released, so we can drop this.<br><br>Change-Id: I9a24b44be77d5ab615b833dda418748fb162fc3d<br>---<br>M stp/STP_Tests_M3UA.ttcn<br>1 file changed, 8 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn</span><br><span>index 1c3b01d..31bab93 100644</span><br><span>--- a/stp/STP_Tests_M3UA.ttcn</span><br><span>+++ b/stp/STP_Tests_M3UA.ttcn</span><br><span>@@ -72,9 +72,6 @@</span><br><span> };</span><br><span> integer mp_recovery_timeout_msec := 2000;</span><br><span> charstring mp_sccp_service_type := "mtp3_itu";</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* is osmo-stp newer than 1.4.0? */</span><br><span style="color: hsl(0, 100%, 40%);">- boolean mp_osmo_stp_newer_than_1_4_0 := true;</span><br><span> }</span><br><span> </span><br><span> type record M3uaConfig {</span><br><span>@@ -1019,18 +1016,8 @@</span><br><span> execute( TC_rkm_reg_static_notpermitted() );</span><br><span> execute( TC_rkm_reg_static_permitted() );</span><br><span> execute( TC_rkm_reg_dynamic_permitted() );</span><br><span style="color: hsl(0, 100%, 40%);">- /* This test has never passed in osmo-stp <= 1.4.0, because it needs</span><br><span style="color: hsl(0, 100%, 40%);">- * patch Ie5d84d06e7d5d32c8a22f770f71a5449f4a78484 which was added</span><br><span style="color: hsl(0, 100%, 40%);">- * afterwards. Disable the test for <= 1.4.0, because the test does not</span><br><span style="color: hsl(0, 100%, 40%);">- * clean up properly and - after other tests were extended - they are</span><br><span style="color: hsl(0, 100%, 40%);">- * now failing in this not properly cleaned up state. After some hours</span><br><span style="color: hsl(0, 100%, 40%);">- * of figuring out that it is definitively this test and trying to</span><br><span style="color: hsl(0, 100%, 40%);">- * figure out what exactly is not cleaning up properly, I decided to</span><br><span style="color: hsl(0, 100%, 40%);">- * just temporarily disable the test for -latest instead of spending</span><br><span style="color: hsl(0, 100%, 40%);">- * even more time on it. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_stp_newer_than_1_4_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_rkm_unreg_never_registered() );</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_rkm_unreg_never_registered() );</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> execute( TC_rkm_unreg_invalid() );</span><br><span> execute( TC_rkm_unreg_registered() );</span><br><span> execute( TC_rkm_unreg_active() );</span><br><span>@@ -1044,14 +1031,12 @@</span><br><span> execute( TC_clnt_sg_to_asp() );</span><br><span> execute( TC_clnt_asp_to_sg() );</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* remove the condition if osmo-stp > 1.4.0 is released */</span><br><span style="color: hsl(0, 100%, 40%);">- if (mp_osmo_stp_newer_than_1_4_0) {</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_clnt_quirk_no_notify_asp_act() );</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_clnt_no_daud_in_asp() );</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_clnt_quirk_daud_in_asp() );</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_clnt_no_snm_inactive() );</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_clnt_quirk_snm_inactive() );</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_clnt_quirk_no_notify_asp_act() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_clnt_no_daud_in_asp() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_clnt_quirk_daud_in_asp() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_clnt_no_snm_inactive() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_clnt_quirk_snm_inactive() );</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> /* M3UA SSNM tests */</span><br><span> execute( TC_ssnm_aspac_dava_aspia_duna() );</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26303">change 26303</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-ttcn3-hacks/+/26303"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I9a24b44be77d5ab615b833dda418748fb162fc3d </div>
<div style="display:none"> Gerrit-Change-Number: 26303 </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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>