[S] Change in osmo-ttcn3-hacks[master]: hnbgw: remove <= 1.5.x code paths

[osmith]

osmith has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37627?usp=email )


Change subject: hnbgw: remove <= 1.5.x code paths
......................................................................

hnbgw: remove <= 1.5.x code paths

Change-Id: Ie1336a7372a46439cf53e38a555f36d0201fa230
---
M hnbgw/HNBGW_Tests.ttcn
1 file changed, 16 insertions(+), 24 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/27/37627/1

diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index 273627d..3765411 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -1560,9 +1560,7 @@
                {name := hnb0_ctr_prefix & "ranap.cs.rab_act.cnf", mtype := 
"c", min := 0, max := 0},
                {name := hnb0_ctr_prefix & "ranap.cs.rab_act.fail", mtype := 
"c", min := 0, max := 0}
        };
-       if (f_osmo_repo_is("nightly")) {
-               f_statsd_expect(expect);
-       }
+       f_statsd_expect(expect);

        f_create_rab(pars.mgcp_pars);

@@ -1571,9 +1569,7 @@
                {name := hnb0_ctr_prefix & "ranap.cs.rab_act.cnf", mtype := 
"c", min := 1, max := 1},
                {name := hnb0_ctr_prefix & "ranap.cs.rab_act.fail", mtype := 
"c", min := 0, max := 0}
        };
-       if (f_osmo_repo_is("nightly")) {
-               f_statsd_expect(expect);
-       }
+       f_statsd_expect(expect);

        /* Send Iu Release */
        tx := valueof(ts_RANAP_IuReleaseCommand(pars.rab_rel_cause));
@@ -1622,9 +1618,7 @@
                {name := hnb0_ctr_prefix & "ranap.cs.rab_act.cnf", mtype := 
"c", min := 0, max := 0},
                {name := hnb0_ctr_prefix & "ranap.cs.rab_act.fail", mtype := 
"c", min := 0, max := 0}
        };
-       if (f_osmo_repo_is("nightly")) {
-               f_statsd_expect(expect);
-       }
+       f_statsd_expect(expect);

        f_rab_ass_req(pars.mgcp_pars);

@@ -1637,9 +1631,7 @@
                {name := hnb0_ctr_prefix & "ranap.cs.rab_act.cnf", mtype := 
"c", min := 0, max := 0},
                {name := hnb0_ctr_prefix & "ranap.cs.rab_act.fail", mtype := 
"c", min := 1, max := 1}
        };
-       if (f_osmo_repo_is("nightly")) {
-               f_statsd_expect(expect);
-       }
+       f_statsd_expect(expect);


        T.start;
@@ -1689,9 +1681,7 @@
        var StatsDExpects expect := {
                {name := hnb0_ctr_prefix & ctr_name, mtype := "c", min := 0, 
max := 0}
        };
-       if (f_osmo_repo_is("nightly")) {
-               f_statsd_expect(expect);
-       }
+       f_statsd_expect(expect);

        /* Send RAB Release */
        tx := valueof(ts_RANAP_RabAssReq(rab_rl := ts_RAB_RL(t_RAB_id(23), 
pars.rab_rel_cause)));
@@ -1700,9 +1690,7 @@
        expect := {
                {name := hnb0_ctr_prefix & ctr_name, mtype := "c", min := 1, 
max := 1}
        };
-       if (f_osmo_repo_is("nightly")) {
-               f_statsd_expect(expect);
-       }
+       f_statsd_expect(expect);

        T.start;

@@ -3049,12 +3037,7 @@
        execute( TC_sgsnpool_sccp_n_pcstate_detaches_cnlink() );
        execute( TC_sgsnpool_sccp_n_pcstate_attaches_cnlink() );

-       /* Run only on nightly since it makes osmo-hnbgw <= 1.5.0 crash: 
OS#6253 */
-       if (f_osmo_repo_is("nightly")) {
-               execute(TC_second_rab_assignment());
-       }
-
-       /* Run at the end since it makes osmo-hnbgw <= 1.3.0 crash: OS#5676 */
+       execute(TC_second_rab_assignment());
        execute(TC_hnb_reregister_reuse_sctp_assoc());

        /* Run at the end since it messes with the SCCP config */

--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37627?usp=email
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: Ie1336a7372a46439cf53e38a555f36d0201fa230
Gerrit-Change-Number: 37627
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osm...@sysmocom.de>
Gerrit-MessageType: newchange