aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-05-15 13:52:16 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2018-05-15 13:52:16 +0200
commit78f7c753a348f9aa6cd1a88f3da46d840ecebedb (patch)
treeff84695ebdb848989ba2586a9cde805ed00dc1b4
parentf32c41519eae34129467bf904d63ca1ab1567259 (diff)
tests: dyn_ts_*: Add tests to verify dyn ts with gprs disabled
-rwxr-xr-xsuites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py4
-rwxr-xr-xsuites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py21
-rwxr-xr-xsuites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py4
-rwxr-xr-xsuites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py21
4 files changed, 42 insertions, 8 deletions
diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py
index 82e357c..4fe4e46 100755
--- a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py
+++ b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py
@@ -16,8 +16,4 @@ def my_bts_setup(bts):
bts.set_trx_phy_channel(0, 6, 'TCH/F_PDCH')
bts.set_trx_phy_channel(0, 7, 'PDCH')
-#FIXME: if we don't enable gprs (gprs none in BSC vty) then dyn chans are broken, see OS#3244
-# Once Fixed, add a new test with following test:
-#call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False)
-
call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=True)
diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py
new file mode 100755
index 0000000..c1349ae
--- /dev/null
+++ b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+from osmo_gsm_tester.testenv import *
+
+import testlib
+suite.test_import_modules_register_for_cleanup(testlib)
+from testlib import call_test_setup_run
+
+def my_bts_setup(bts):
+ bts.set_num_trx(1)
+ bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4')
+ bts.set_trx_phy_channel(0, 1, 'SDCCH8')
+ bts.set_trx_phy_channel(0, 2, 'TCH/F_PDCH')
+ bts.set_trx_phy_channel(0, 3, 'TCH/F_PDCH')
+ bts.set_trx_phy_channel(0, 4, 'TCH/F_PDCH')
+ bts.set_trx_phy_channel(0, 5, 'TCH/F_PDCH')
+ bts.set_trx_phy_channel(0, 6, 'TCH/F_PDCH')
+ bts.set_trx_phy_channel(0, 7, 'TCH/F_PDCH')
+
+# Check that dynamic timeslots work fine with gprs disabled.
+
+call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False)
diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py
index 1424da8..b9b7935 100755
--- a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py
+++ b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py
@@ -16,8 +16,4 @@ def my_bts_setup(bts):
bts.set_trx_phy_channel(0, 6, 'TCH/F_TCH/H_PDCH')
bts.set_trx_phy_channel(0, 7, 'PDCH')
-#FIXME: if we don't enable gprs (gprs none in BSC vty) then dyn chans are broken, see OS#3244
-# Once Fixed, add a new test with following test:
-#call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False)
-
call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=True)
diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py
new file mode 100755
index 0000000..d80d27a
--- /dev/null
+++ b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+from osmo_gsm_tester.testenv import *
+
+import testlib
+suite.test_import_modules_register_for_cleanup(testlib)
+from testlib import call_test_setup_run
+
+def my_bts_setup(bts):
+ bts.set_num_trx(1)
+ bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4')
+ bts.set_trx_phy_channel(0, 1, 'SDCCH8')
+ bts.set_trx_phy_channel(0, 2, 'TCH/F_TCH/H_PDCH')
+ bts.set_trx_phy_channel(0, 3, 'TCH/F_TCH/H_PDCH')
+ bts.set_trx_phy_channel(0, 4, 'TCH/F_TCH/H_PDCH')
+ bts.set_trx_phy_channel(0, 5, 'TCH/F_TCH/H_PDCH')
+ bts.set_trx_phy_channel(0, 6, 'TCH/F_TCH/H_PDCH')
+ bts.set_trx_phy_channel(0, 7, 'TCH/F_TCH/H_PDCH')
+
+# Check that dynamic timeslots work fine with gprs disabled.
+
+call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False)