pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32286 )
Change subject: pcu: Fix some tests missing proper tear down
......................................................................
pcu: Fix some tests missing proper tear down
As a result, they sometimes end up in error during test tear down, and
they show up as failed.
Change-Id: I89047a57a508df5c18e0d7bd2366cf15cda055be
---
M pcu/PCU_Tests.ttcn
1 file changed, 40 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/86/32286/1
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 954216f..f859b9b 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -560,6 +560,8 @@
ms.ta, ", but received ", pkt_ta.val);
f_shutdown(__BFILE__, __LINE__);
}
+
+ f_shutdown(__BFILE__, __LINE__, final := true);
}
/* Verify Timing Advance value(s) indicated during the packet Downlink
assignment
@@ -1143,6 +1145,8 @@
f_pcuvty_set_link_quality_ranges();
f_dl_data_exp_cs(f_rlcmac_block_int2cs_mcs(g_cs_max_dl, false));
+
+ f_shutdown(__BFILE__, __LINE__, final := true);
}
/* Check DL CS4 is used in good link conditions if allowed by config */
@@ -1162,6 +1166,8 @@
f_pcuvty_set_link_quality_ranges();
f_dl_data_exp_cs(f_rlcmac_block_int2cs_mcs(g_cs_max_dl, false));
+
+ f_shutdown(__BFILE__, __LINE__, final := true);
}
/* Test the initial UL MCS set by VTY works fine */
@@ -1341,6 +1347,8 @@
f_pcuvty_set_link_quality_ranges();
f_dl_data_exp_cs(f_rlcmac_block_int2cs_mcs(g_mcs_max_dl, true),
bssgp_ms_racap_egprs_def);
+
+ f_shutdown(__BFILE__, __LINE__, final := true);
}
/* Verify PCU drops TBF after some time of inactivity. */
@@ -2495,6 +2503,8 @@
{ name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min :=
1, max := 1 }
};
f_statsd_expect(expect);
+
+ f_shutdown(__BFILE__, __LINE__, final := true);
}
testcase TC_mo_ping_pong_with_ul_racap_egprs_only() runs on RAW_PCU_Test_CT {
@@ -2516,6 +2526,8 @@
{ name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min :=
1, max := 1 }
};
f_statsd_expect(expect);
+
+ f_shutdown(__BFILE__, __LINE__, final := true);
}
testcase TC_force_two_phase_access() runs on RAW_PCU_Test_CT {
@@ -2540,6 +2552,8 @@
{ name := "TTCN3.bts.0.pkt.ul_assignment", mtype := "c", min :=
1, max := 1 }
};
f_statsd_expect(expect);
+
+ f_shutdown(__BFILE__, __LINE__, final := true);
}
/* Test scenario where SGSN wants to send some data against MS and it is
@@ -5972,6 +5986,8 @@
sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp);
f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn);
}
+
+ f_shutdown(__BFILE__, __LINE__, final := true);
}
/* Test MS sending Pkt Cell Change Notification twice (duplicate msg) while
sending Pkt Cell Change Continue */
@@ -6039,6 +6055,8 @@
sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp);
f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn);
}
+
+ f_shutdown(__BFILE__, __LINE__, final := true);
}
/* Test MS sending Pkt Cell Change Notification twice (duplicate msg) while
waiting for Pkt Cell Change Continue CTRL ACK */
@@ -6106,6 +6124,8 @@
sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp);
f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn);
}
+
+ f_shutdown(__BFILE__, __LINE__, final := true);
}
/* Test MS sending Pkt Cell Change Notify twice (different tgt cell each time)
@@ -6342,6 +6362,8 @@
sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp);
f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn);
}
+
+ f_shutdown(__BFILE__, __LINE__, final := true);
}
/* Test MS sending Pkt Cell Change Notification twice (different tgt cell)
while sending Pkt Cell Change Continue */
@@ -6421,6 +6443,8 @@
sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp);
f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn);
}
+
+ f_shutdown(__BFILE__, __LINE__, final := true);
}
/* Test MS sending Pkt Cell Change Notification twice (different tgt cell)
while waiting for Pkt Cell Change Continue CTRL ACK*/
@@ -6527,6 +6551,8 @@
sched_fn := f_rrbp_ack_fn(sched_fn, dl_block.ctrl.mac_hdr.rrbp);
f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn);
}
+
+ f_shutdown(__BFILE__, __LINE__, final := true);
}
/* Test MS sending Pkt Cell Change Notification on an MS with an existing but
unassigned (no TFI) DL TBF */
@@ -6609,6 +6635,8 @@
f_acknackdesc_ack_block(ms.dl_tbf.acknack_desc, dl_block, '1'B);
f_ms_tx_ul_block(ms, ts_RLCMAC_DL_ACK_NACK(ms.dl_tbf.tfi,
ms.dl_tbf.acknack_desc),
f_dl_block_ack_fn(dl_block, dl_fn));
+
+ f_shutdown(__BFILE__, __LINE__, final := true);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32286
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: I89047a57a508df5c18e0d7bd2366cf15cda055be
Gerrit-Change-Number: 32286
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <[email protected]>
Gerrit-MessageType: newchange
