pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28408 )
Change subject: bsc: make BSC_Tests_CBSP module a friend of BSC_Tests
......................................................................
bsc: make BSC_Tests_CBSP module a friend of BSC_Tests
This allows BSC_Tests_CBSP to import friendly API from BSC_Tests.
The line importing stuff from BSC_Tests BSC_Tests_CBSP.ttcn is moved
on top for consistency with an existing friend - BSC_Tests_VAMOS.
Change-Id: Ie0bb5c2e33aadd4858f0f6d001468985c40ab152
---
M bsc/BSC_Tests.ttcn
M bsc/BSC_Tests_CBSP.ttcn
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 200fd5b..c2cf8d3 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -21,6 +21,7 @@
*/
friend module BSC_Tests_VAMOS;
+friend module BSC_Tests_CBSP;
import from Misc_Helpers all;
import from General_Types all;
diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn
index 53f7fbc..e38b8a6 100644
--- a/bsc/BSC_Tests_CBSP.ttcn
+++ b/bsc/BSC_Tests_CBSP.ttcn
@@ -12,6 +12,8 @@
* This test suite tests OsmoBSC while emulating the CBC (Cell Broadcast Centre)
*/
+import from BSC_Tests all;
+
import from General_Types all;
import from Osmocom_Types all;
import from GSM_Types all;
@@ -19,8 +21,6 @@
import from BSSAP_Types all;
import from BSSMAP_Templates all;
-import from BSC_Tests all;
-
import from IPA_Emulation all;
import from IPA_CodecPort all;
import from IPA_Types all;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28408
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: Ie0bb5c2e33aadd4858f0f6d001468985c40ab152
Gerrit-Change-Number: 28408
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28409 )
Change subject: bsc: release dchan in TC_cbsp_emerg_write_bts_cgi_dchan
......................................................................
bsc: release dchan in TC_cbsp_emerg_write_bts_cgi_dchan
A follow-up patch is adding BSC_Tests.f_shutdown_helper() calls to all
CBSP testcases, what makes TC_cbsp_emerg_write_bts_cgi_dchan fail due
to talloc count mismatch. All dchans need to be released to avoid this.
Change-Id: I8b707c821693f930ab10bd8feea08ba5007da967
---
M bsc/BSC_Tests.ttcn
M bsc/BSC_Tests_CBSP.ttcn
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index c2cf8d3..ed56fc2 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -8257,7 +8257,7 @@
BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ);
}
-private function f_perform_clear_test_ct(DchanTuple dt)
+friend function f_perform_clear_test_ct(DchanTuple dt)
runs on test_CT
{
/* Instruct BSC to clear channel */
diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn
index e38b8a6..61b2efd 100644
--- a/bsc/BSC_Tests_CBSP.ttcn
+++ b/bsc/BSC_Tests_CBSP.ttcn
@@ -971,6 +971,8 @@
setverdict(fail, "Waiting for APP INFO");
}
}
+
+ f_perform_clear_test_ct(dt);
}
private function f_exp_rsl_etws(integer rsl_idx := 0, boolean enabled) runs on cbsp_test_CT {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28409
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: I8b707c821693f930ab10bd8feea08ba5007da967
Gerrit-Change-Number: 28409
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28408 )
Change subject: bsc: make BSC_Tests_CBSP module a friend of BSC_Tests
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28408
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: Ie0bb5c2e33aadd4858f0f6d001468985c40ab152
Gerrit-Change-Number: 28408
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 23 Jun 2022 12:10:24 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28406 )
Change subject: bsc: Call f_shutdown_helper() in BSC_Tests_CBSP tests
......................................................................
Patch Set 3:
(1 comment)
File bsc/BSC_Tests_CBSP.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28406/comment/5518e449_2570…
PS2, Line 15: import from BSC_Tests all;
> It's not unrelated. The relationship between the 2 modules changed in this patch.
See https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28408.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28406
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: I5ddce5cfcbfb057b4559a5d5a710d218bae1d8fe
Gerrit-Change-Number: 28406
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 23 Jun 2022 12:09:04 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28407 )
Change subject: cbc: Introduce f_shutdown_helper() and call it in every test
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28407
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: I95e6f8a5a5c35d35662950e1105bdb17d2ca00de
Gerrit-Change-Number: 28407
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 23 Jun 2022 12:08:17 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28409 )
Change subject: bsc: release dchan in TC_cbsp_emerg_write_bts_cgi_dchan
......................................................................
bsc: release dchan in TC_cbsp_emerg_write_bts_cgi_dchan
A follow-up patch is adding BSC_Tests.f_shutdown_helper() calls to all
CBSP testcases, what makes TC_cbsp_emerg_write_bts_cgi_dchan fail due
to talloc count mismatch. All dchans need to be released to avoid this.
Change-Id: I8b707c821693f930ab10bd8feea08ba5007da967
---
M bsc/BSC_Tests.ttcn
M bsc/BSC_Tests_CBSP.ttcn
2 files changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/28409/1
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index c2cf8d3..ed56fc2 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -8257,7 +8257,7 @@
BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ);
}
-private function f_perform_clear_test_ct(DchanTuple dt)
+friend function f_perform_clear_test_ct(DchanTuple dt)
runs on test_CT
{
/* Instruct BSC to clear channel */
diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn
index e38b8a6..61b2efd 100644
--- a/bsc/BSC_Tests_CBSP.ttcn
+++ b/bsc/BSC_Tests_CBSP.ttcn
@@ -971,6 +971,8 @@
setverdict(fail, "Waiting for APP INFO");
}
}
+
+ f_perform_clear_test_ct(dt);
}
private function f_exp_rsl_etws(integer rsl_idx := 0, boolean enabled) runs on cbsp_test_CT {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28409
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: I8b707c821693f930ab10bd8feea08ba5007da967
Gerrit-Change-Number: 28409
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange