<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12337">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Max: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">VLR tests: avoid leaking LAC access details<br><br>Avoid leaking details on accessing data structure for LAC value into<br>test output: that's irrelevant clutter which forces unnecessary test<br>output modifications.<br><br>Change-Id: I4a1d7884cf47ad513d7d6fb27c5c6f1b829dff2e<br>---<br>M tests/msc_vlr/msc_vlr_test_call.c<br>M tests/msc_vlr/msc_vlr_test_call.err<br>M tests/msc_vlr/msc_vlr_test_ss.c<br>M tests/msc_vlr/msc_vlr_test_ss.err<br>4 files changed, 9 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c</span><br><span>index ef88c5a..4a4f243 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_call.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_call.c</span><br><span>@@ -154,7 +154,7 @@</span><br><span>      vsub = vlr_subscr_find_by_imsi(net->vlr, IMSI);</span><br><span>   VERBOSE_ASSERT(vsub != NULL, == true, "%d");</span><br><span>       VERBOSE_ASSERT(strcmp(vsub->imsi, IMSI), == 0, "%d");</span><br><span style="color: hsl(0, 100%, 40%);">-      VERBOSE_ASSERT(vsub->lac, == 23, "%u");</span><br><span style="color: hsl(120, 100%, 40%);">+  VAL_ASSERT("LAC", vsub->lac, == 23, "%u");</span><br><span>    vlr_subscr_put(vsub);</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err</span><br><span>index 481a2db..db0d58c 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_call.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_call.err</span><br><span>@@ -175,7 +175,7 @@</span><br><span> DREF VLR subscr MSISDN:42342 usage increases to: 2</span><br><span>   vsub != NULL == 1</span><br><span>   strcmp(vsub->imsi, IMSI) == 0</span><br><span style="color: hsl(0, 100%, 40%);">-  vsub->lac == 23</span><br><span style="color: hsl(120, 100%, 40%);">+  LAC == 23</span><br><span> DREF VLR subscr MSISDN:42342 usage decreases to: 1</span><br><span> ---</span><br><span> - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector</span><br><span>@@ -555,7 +555,7 @@</span><br><span> DREF VLR subscr MSISDN:42342 usage increases to: 2</span><br><span>   vsub != NULL == 1</span><br><span>   strcmp(vsub->imsi, IMSI) == 0</span><br><span style="color: hsl(0, 100%, 40%);">-  vsub->lac == 23</span><br><span style="color: hsl(120, 100%, 40%);">+  LAC == 23</span><br><span> DREF VLR subscr MSISDN:42342 usage decreases to: 1</span><br><span> ---</span><br><span> - after a while, MNCC asks us to setup a call, causing Paging</span><br><span>@@ -934,7 +934,7 @@</span><br><span> DREF VLR subscr MSISDN:42342 usage increases to: 2</span><br><span>   vsub != NULL == 1</span><br><span>   strcmp(vsub->imsi, IMSI) == 0</span><br><span style="color: hsl(0, 100%, 40%);">-  vsub->lac == 23</span><br><span style="color: hsl(120, 100%, 40%);">+  LAC == 23</span><br><span> DREF VLR subscr MSISDN:42342 usage decreases to: 1</span><br><span> ---</span><br><span> - after a while, MNCC asks us to setup a call, causing Paging</span><br><span>@@ -1279,7 +1279,7 @@</span><br><span> DREF VLR subscr MSISDN:42342 usage increases to: 2</span><br><span>   vsub != NULL == 1</span><br><span>   strcmp(vsub->imsi, IMSI) == 0</span><br><span style="color: hsl(0, 100%, 40%);">-  vsub->lac == 23</span><br><span style="color: hsl(120, 100%, 40%);">+  LAC == 23</span><br><span> DREF VLR subscr MSISDN:42342 usage decreases to: 1</span><br><span> ---</span><br><span> - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector</span><br><span>@@ -1621,7 +1621,7 @@</span><br><span> DREF VLR subscr MSISDN:42342 usage increases to: 2</span><br><span>   vsub != NULL == 1</span><br><span>   strcmp(vsub->imsi, IMSI) == 0</span><br><span style="color: hsl(0, 100%, 40%);">-  vsub->lac == 23</span><br><span style="color: hsl(120, 100%, 40%);">+  LAC == 23</span><br><span> DREF VLR subscr MSISDN:42342 usage decreases to: 1</span><br><span> ---</span><br><span> - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_ss.c b/tests/msc_vlr/msc_vlr_test_ss.c</span><br><span>index 34aa634..4e8077e 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_ss.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_ss.c</span><br><span>@@ -68,7 +68,7 @@</span><br><span>   vsub = vlr_subscr_find_by_imsi(net->vlr, IMSI);</span><br><span>   VERBOSE_ASSERT(vsub != NULL, == true, "%d");</span><br><span>       VERBOSE_ASSERT(strcmp(vsub->imsi, IMSI), == 0, "%d");</span><br><span style="color: hsl(0, 100%, 40%);">-      VERBOSE_ASSERT(vsub->lac, == 23, "%u");</span><br><span style="color: hsl(120, 100%, 40%);">+  VAL_ASSERT("LAC", vsub->lac, == 23, "%u");</span><br><span>    vlr_subscr_put(vsub);</span><br><span> </span><br><span>    bss_sends_clear_complete();</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err</span><br><span>index fe869ad..1d4a0c6 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_ss.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_ss.err</span><br><span>@@ -91,7 +91,7 @@</span><br><span> DREF VLR subscr MSISDN:46071 usage increases to: 3</span><br><span>   vsub != NULL == 1</span><br><span>   strcmp(vsub->imsi, IMSI) == 0</span><br><span style="color: hsl(0, 100%, 40%);">-  vsub->lac == 23</span><br><span style="color: hsl(120, 100%, 40%);">+  LAC == 23</span><br><span> DREF VLR subscr MSISDN:46071 usage decreases to: 2</span><br><span> - BSS sends BSSMAP Clear Complete</span><br><span> DREF MSISDN:46071: MSC conn use - release == 0 (0x0: )</span><br><span>@@ -287,7 +287,7 @@</span><br><span> DREF VLR subscr MSISDN:46071 usage increases to: 3</span><br><span>   vsub != NULL == 1</span><br><span>   strcmp(vsub->imsi, IMSI) == 0</span><br><span style="color: hsl(0, 100%, 40%);">-  vsub->lac == 23</span><br><span style="color: hsl(120, 100%, 40%);">+  LAC == 23</span><br><span> DREF VLR subscr MSISDN:46071 usage decreases to: 2</span><br><span> - BSS sends BSSMAP Clear Complete</span><br><span> DREF MSISDN:46071: MSC conn use - release == 0 (0x0: )</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12337">change 12337</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/12337"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I4a1d7884cf47ad513d7d6fb27c5c6f1b829dff2e </div>
<div style="display:none"> Gerrit-Change-Number: 12337 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </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: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <stsp@stsp.name> </div>