<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11643">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">PCU: cleanup test config<br><br>* remove unused parameters<br>* add expected results<br>* use control for default test execution<br>* only tests which could (in theory) pass are left in control<br><br>Previously generic control had some tests which never called<br>"setverdict(pass)" which means they would always fail. Such tests might<br>be useful during development but should not be part of test set executed<br>by default.<br><br>Change-Id: I91910e18f108f8ee9a3b76ced16c420fdbdb665a<br>Related: OS#2890<br>---<br>M pcu/PCU_Tests.cfg<br>M pcu/PCU_Tests.ttcn<br>A pcu/expected-results.xml<br>3 files changed, 12 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pcu/PCU_Tests.cfg b/pcu/PCU_Tests.cfg</span><br><span>index 7e0b9f2..5975290 100644</span><br><span>--- a/pcu/PCU_Tests.cfg</span><br><span>+++ b/pcu/PCU_Tests.cfg</span><br><span>@@ -7,10 +7,6 @@</span><br><span> ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | DEBUG_ENCDEC</span><br><span> </span><br><span> [MODULE_PARAMETERS]</span><br><span style="color: hsl(0, 100%, 40%);">-#mp_local_ip := "192.168.100.239"</span><br><span style="color: hsl(0, 100%, 40%);">-#mp_local_udp_port := 23000</span><br><span style="color: hsl(0, 100%, 40%);">-#mp_remote_ip := "192.168.100.196"</span><br><span style="color: hsl(0, 100%, 40%);">-#mp_remote_udp_port := 21000</span><br><span> PCU_Tests.mp_nsconfig := {</span><br><span> local_ip := "127.0.0.1",</span><br><span> local_udp_port := 23000,</span><br><span>@@ -36,26 +32,18 @@</span><br><span> }</span><br><span> </span><br><span> [TESTPORT_PARAMETERS]</span><br><span style="color: hsl(0, 100%, 40%);">-#*.BSCVTY.CTRL_MODE := "client"</span><br><span style="color: hsl(0, 100%, 40%);">-#*.BSCVTY.CTRL_HOSTNAME := "127.0.0.1"</span><br><span style="color: hsl(0, 100%, 40%);">-#*.BSCVTY.CTRL_PORTNUM := "4242"</span><br><span style="color: hsl(0, 100%, 40%);">-#*.BSCVTY.CTRL_LOGIN_SKIPPED := "yes"</span><br><span style="color: hsl(0, 100%, 40%);">-#*.BSCVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes"</span><br><span style="color: hsl(0, 100%, 40%);">-#*.BSCVTY.CTRL_READMODE := "buffered"</span><br><span style="color: hsl(0, 100%, 40%);">-#*.BSCVTY.CTRL_CLIENT_CLEANUP_LINEFEED := "yes"</span><br><span style="color: hsl(0, 100%, 40%);">-#*.BSCVTY.PROMPT1 := "OpenBSC> "</span><br><span style="color: hsl(0, 100%, 40%);">-#*.BSCVTY.PROMPT2 := "OpenBSC# "</span><br><span style="color: hsl(0, 100%, 40%);">-#*.BSCVTY.REGEX_PROMPT1 := "^OpenBSC.*$"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> *.*.udpReuseAddress := "yes";</span><br><span> </span><br><span> [MAIN_CONTROLLER]</span><br><span> </span><br><span> [EXECUTE]</span><br><span style="color: hsl(120, 100%, 40%);">+PCU_Tests.control</span><br><span style="color: hsl(120, 100%, 40%);">+# for internal use only: will always fail when called as part of normal routine</span><br><span> #PCU_Tests.TC_selftest_llc</span><br><span> #PCU_Tests.TC_selftest_rlcmac</span><br><span> #PCU_Tests.TC_selftest_bssgp</span><br><span> #PCU_Tests.TC_nsem</span><br><span> #PCU_Tests.TC_paging</span><br><span style="color: hsl(0, 100%, 40%);">-PCU_Tests.TC_rach</span><br><span style="color: hsl(120, 100%, 40%);">+#PCU_Tests.TC_rach</span><br><span> #PCU_Tests.TC_selftest_rr</span><br><span style="color: hsl(120, 100%, 40%);">+#PCU_Tests.TC_dl_tbf</span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index a63ca1d..adbc73e 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -630,12 +630,8 @@</span><br><span> </span><br><span> </span><br><span> control {</span><br><span style="color: hsl(0, 100%, 40%);">- execute(TC_selftest_bssgp());</span><br><span> execute(TC_selftest_ns());</span><br><span style="color: hsl(0, 100%, 40%);">- execute(TC_selftest_llc());</span><br><span style="color: hsl(0, 100%, 40%);">- execute(TC_selftest_rr());</span><br><span style="color: hsl(0, 100%, 40%);">- execute(TC_selftest_rlcmac());</span><br><span style="color: hsl(0, 100%, 40%);">- execute(TC_nsem());</span><br><span style="color: hsl(0, 100%, 40%);">- execute(TC_paging());</span><br><span style="color: hsl(120, 100%, 40%);">+ execute(TC_ul_tbf_single_llc_sizes());</span><br><span style="color: hsl(120, 100%, 40%);">+ execute(TC_ul_tbf());</span><br><span> }</span><br><span> };</span><br><span>diff --git a/pcu/expected-results.xml b/pcu/expected-results.xml</span><br><span>new file mode 100644</span><br><span>index 0000000..aec661d</span><br><span>--- /dev/null</span><br><span>+++ b/pcu/expected-results.xml</span><br><span>@@ -0,0 +1,6 @@</span><br><span style="color: hsl(120, 100%, 40%);">+<?xml version="1.0"?></span><br><span style="color: hsl(120, 100%, 40%);">+<testsuite name='PCU_Tests' tests='3' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='PCU_Tests' name='TC_ul_tbf_single_llc_sizes' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='PCU_Tests' name='TC_ul_tbf' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='PCU_Tests' name='TC_selftest_ns' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+</testsuite></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11643">change 11643</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11643"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I91910e18f108f8ee9a3b76ced16c420fdbdb665a </div>
<div style="display:none"> Gerrit-Change-Number: 11643 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <ssperling@sysmocom.de> </div>