PCU: cleanup test config
* remove unused parameters
* add expected results
* use control for default test execution
* only tests which could (in theory) pass are left in control
Previously generic control had some tests which never called
"setverdict(pass)" which means they would always fail. Such tests might
be useful during development but should not be part of test set executed
by default.
Change-Id: I91910e18f108f8ee9a3b76ced16c420fdbdb665a
Related: OS#2890
diff --git a/pcu/PCU_Tests.cfg b/pcu/PCU_Tests.cfg
index 7e0b9f2..5975290 100644
--- a/pcu/PCU_Tests.cfg
+++ b/pcu/PCU_Tests.cfg
@@ -7,10 +7,6 @@
ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | DEBUG_ENCDEC
[MODULE_PARAMETERS]
-#mp_local_ip := "192.168.100.239"
-#mp_local_udp_port := 23000
-#mp_remote_ip := "192.168.100.196"
-#mp_remote_udp_port := 21000
PCU_Tests.mp_nsconfig := {
local_ip := "127.0.0.1",
local_udp_port := 23000,
@@ -36,26 +32,18 @@
}
[TESTPORT_PARAMETERS]
-#*.BSCVTY.CTRL_MODE := "client"
-#*.BSCVTY.CTRL_HOSTNAME := "127.0.0.1"
-#*.BSCVTY.CTRL_PORTNUM := "4242"
-#*.BSCVTY.CTRL_LOGIN_SKIPPED := "yes"
-#*.BSCVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes"
-#*.BSCVTY.CTRL_READMODE := "buffered"
-#*.BSCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes"
-#*.BSCVTY.PROMPT1 := "OpenBSC> "
-#*.BSCVTY.PROMPT2 := "OpenBSC# "
-#*.BSCVTY.REGEX_PROMPT1 := "^OpenBSC.*$"
-
*.*.udpReuseAddress := "yes";
[MAIN_CONTROLLER]
[EXECUTE]
+PCU_Tests.control
+# for internal use only: will always fail when called as part of normal routine
#PCU_Tests.TC_selftest_llc
#PCU_Tests.TC_selftest_rlcmac
#PCU_Tests.TC_selftest_bssgp
#PCU_Tests.TC_nsem
#PCU_Tests.TC_paging
-PCU_Tests.TC_rach
+#PCU_Tests.TC_rach
#PCU_Tests.TC_selftest_rr
+#PCU_Tests.TC_dl_tbf
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index a63ca1d..adbc73e 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -630,12 +630,8 @@
control {
- execute(TC_selftest_bssgp());
execute(TC_selftest_ns());
- execute(TC_selftest_llc());
- execute(TC_selftest_rr());
- execute(TC_selftest_rlcmac());
- execute(TC_nsem());
- execute(TC_paging());
+ execute(TC_ul_tbf_single_llc_sizes());
+ execute(TC_ul_tbf());
}
};
diff --git a/pcu/expected-results.xml b/pcu/expected-results.xml
new file mode 100644
index 0000000..aec661d
--- /dev/null
+++ b/pcu/expected-results.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<testsuite name='PCU_Tests' tests='3' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'>
+ <testcase classname='PCU_Tests' name='TC_ul_tbf_single_llc_sizes' time='MASKED'/>
+ <testcase classname='PCU_Tests' name='TC_ul_tbf' time='MASKED'/>
+ <testcase classname='PCU_Tests' name='TC_selftest_ns' time='MASKED'/>
+</testsuite>