Change in osmo-ttcn3-hacks[master]: stp: Drop mp_osmo_stp_newer_than_1_4_0

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26303 )

Change subject: stp: Drop mp_osmo_stp_newer_than_1_4_0
......................................................................

stp: Drop mp_osmo_stp_newer_than_1_4_0

osmo-stp 1.5.0 has been released, so we can drop this.

Change-Id: I9a24b44be77d5ab615b833dda418748fb162fc3d
---
M stp/STP_Tests_M3UA.ttcn
1 file changed, 8 insertions(+), 23 deletions(-)

Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, approved



diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn
index 1c3b01d..31bab93 100644
--- a/stp/STP_Tests_M3UA.ttcn
+++ b/stp/STP_Tests_M3UA.ttcn
@@ -72,9 +72,6 @@
 	};
 	integer mp_recovery_timeout_msec := 2000;
 	charstring mp_sccp_service_type := "mtp3_itu";
-
-	/* is osmo-stp newer than 1.4.0? */
-	boolean mp_osmo_stp_newer_than_1_4_0 := true;
 }
 
 type record M3uaConfig {
@@ -1019,18 +1016,8 @@
 	execute( TC_rkm_reg_static_notpermitted() );
 	execute( TC_rkm_reg_static_permitted() );
 	execute( TC_rkm_reg_dynamic_permitted() );
-	/* This test has never passed in osmo-stp <= 1.4.0, because it needs
-	 * patch Ie5d84d06e7d5d32c8a22f770f71a5449f4a78484 which was added
-	 * afterwards. Disable the test for <= 1.4.0, because the test does not
-	 * clean up properly and - after other tests were extended - they are
-	 * now failing in this not properly cleaned up state. After some hours
-	 * of figuring out that it is definitively this test and trying to
-	 * figure out what exactly is not cleaning up properly, I decided to
-	 * just temporarily disable the test for -latest instead of spending
-	 * even more time on it. */
-	if (mp_osmo_stp_newer_than_1_4_0) {
-		execute( TC_rkm_unreg_never_registered() );
-	}
+	execute( TC_rkm_unreg_never_registered() );
+
 	execute( TC_rkm_unreg_invalid() );
 	execute( TC_rkm_unreg_registered() );
 	execute( TC_rkm_unreg_active() );
@@ -1044,14 +1031,12 @@
 	execute( TC_clnt_sg_to_asp() );
 	execute( TC_clnt_asp_to_sg() );
 
-	/* remove the condition if osmo-stp > 1.4.0 is released */
-	if (mp_osmo_stp_newer_than_1_4_0) {
-		execute( TC_clnt_quirk_no_notify_asp_act() );
-		execute( TC_clnt_no_daud_in_asp() );
-		execute( TC_clnt_quirk_daud_in_asp() );
-		execute( TC_clnt_no_snm_inactive() );
-		execute( TC_clnt_quirk_snm_inactive() );
-	}
+	execute( TC_clnt_quirk_no_notify_asp_act() );
+	execute( TC_clnt_no_daud_in_asp() );
+	execute( TC_clnt_quirk_daud_in_asp() );
+	execute( TC_clnt_no_snm_inactive() );
+	execute( TC_clnt_quirk_snm_inactive() );
+
 
 	/* M3UA SSNM tests */
 	execute( TC_ssnm_aspac_dava_aspia_duna() );

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26303
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I9a24b44be77d5ab615b833dda418748fb162fc3d
Gerrit-Change-Number: 26303
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211117/a635d064/attachment.htm>