<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20655">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tests/power_test: do not assert in apply_power_test()<br><br>Instead, print the actual vs expected values.<br><br>Change-Id: Ie88e275ba78cef7a9ba20d34c269881216fb0ce3<br>Related: SYS#4916<br>---<br>M tests/power/power_test.c<br>M tests/power/power_test.ok<br>2 files changed, 57 insertions(+), 28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/power/power_test.c b/tests/power/power_test.c</span><br><span>index 0d3457a..c3bfdf9 100644</span><br><span>--- a/tests/power/power_test.c</span><br><span>+++ b/tests/power/power_test.c</span><br><span>@@ -55,11 +55,16 @@</span><br><span> </span><br><span> static inline void apply_power_test(struct gsm_lchan *lchan, int rxlev, int exp_ret, uint8_t exp_current)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int ret = lchan_ms_pwr_ctrl(lchan, lchan->ms_power_ctrl.current, rxlev);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t old;</span><br><span style="color: hsl(120, 100%, 40%);">+ int ret;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printf("power control [%d]: MS current power %u\n", ret, lchan->ms_power_ctrl.current);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(ret == exp_ret);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(lchan->ms_power_ctrl.current == exp_current);</span><br><span style="color: hsl(120, 100%, 40%);">+ old = lchan->ms_power_ctrl.current;</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = lchan_ms_pwr_ctrl(lchan, lchan->ms_power_ctrl.current, rxlev);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("lchan_ms_pwr_ctrl(RxLvl=%d dBm) returns %d (expected %d)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rxlev, ret, exp_ret);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\tMS current power %u -> %u (expected %u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ old, lchan->ms_power_ctrl.current, exp_current);</span><br><span> }</span><br><span> </span><br><span> static void test_power_loop(void)</span><br><span>diff --git a/tests/power/power_test.ok b/tests/power/power_test.ok</span><br><span>index e325bb7..6b7a0d4 100644</span><br><span>--- a/tests/power/power_test.ok</span><br><span>+++ b/tests/power/power_test.ok</span><br><span>@@ -1,28 +1,52 @@</span><br><span> Testing power loop...</span><br><span> </span><br><span> Starting test case 'test_power_loop'</span><br><span style="color: hsl(0, 100%, 40%);">-power control [0]: MS current power 15</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 13</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 11</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 9</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 7</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 5</span><br><span style="color: hsl(0, 100%, 40%);">-power control [0]: MS current power 5</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 3</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 2</span><br><span style="color: hsl(0, 100%, 40%);">-power control [0]: MS current power 2</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 0</span><br><span style="color: hsl(0, 100%, 40%);">-power control [0]: MS current power 0</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 30</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 29</span><br><span style="color: hsl(0, 100%, 40%);">-power control [0]: MS current power 29</span><br><span style="color: hsl(0, 100%, 40%);">-power control [0]: MS current power 29</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 1</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 5</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 9</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 10</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 9</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 14</span><br><span style="color: hsl(0, 100%, 40%);">-power control [0]: MS current power 14</span><br><span style="color: hsl(0, 100%, 40%);">-power control [1]: MS current power 15</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-60 dBm) returns 0 (expected 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 15 -> 15 (expected 15)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 15 -> 13 (expected 13)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 13 -> 11 (expected 11)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 11 -> 9 (expected 9)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 9 -> 7 (expected 7)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 7 -> 5 (expected 5)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-75 dBm) returns 0 (expected 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 5 -> 5 (expected 5)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 5 -> 3 (expected 3)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 3 -> 2 (expected 2)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 2 -> 2 (expected 2)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 2 -> 0 (expected 0)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 0 -> 0 (expected 0)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 0 -> 30 (expected 30)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 30 -> 29 (expected 29)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-90 dBm) returns 0 (expected 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 29 -> 29 (expected 29)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-75 dBm) returns 0 (expected 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 29 -> 29 (expected 29)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-45 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 29 -> 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-45 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 1 -> 5 (expected 5)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-45 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 5 -> 9 (expected 9)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-73 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 9 -> 10 (expected 10)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-77 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 10 -> 9 (expected 9)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-73 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 9 -> 14 (expected 14)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-60 dBm) returns 0 (expected 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 14 -> 14 (expected 14)</span><br><span style="color: hsl(120, 100%, 40%);">+lchan_ms_pwr_ctrl(RxLvl=-40 dBm) returns 1 (expected 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ MS current power 14 -> 15 (expected 15)</span><br><span> Power loop test OK</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20655">change 20655</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/c/osmo-bts/+/20655"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie88e275ba78cef7a9ba20d34c269881216fb0ce3 </div>
<div style="display:none"> Gerrit-Change-Number: 20655 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>