<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10674">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;">mgcp_test: fix log of conn_id presence<br><br>Flip logic to accurately log whether an 'I:' is included, instead of logging<br>the opposite.<br><br>Note that it isn't possible to log the actual conn ID, because they are random<br>and differ in every test run, which would collide with the fixed expected<br>output file mgcp_test.ok.<br><br>Change-Id: Idcd731b9daf618b97d8f7e6a776266071cd29e08<br>---<br>M tests/mgcp/mgcp_test.c<br>M tests/mgcp/mgcp_test.ok<br>2 files changed, 27 insertions(+), 27 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index f8f701e..228b2f9 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -737,7 +737,7 @@</span><br><span> if (msg) {</span><br><span> rc = get_conn_id_from_response(msg->data, last_conn_id,</span><br><span> sizeof(last_conn_id));</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc == 0)</span><br><span> printf("(response contains a connection id)\n");</span><br><span> else</span><br><span> printf("(response does not contain a connection id)\n");</span><br><span>diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok</span><br><span>index fcad85a..915d45e 100644</span><br><span>--- a/tests/mgcp/mgcp_test.ok</span><br><span>+++ b/tests/mgcp/mgcp_test.ok</span><br><span>@@ -22,7 +22,7 @@</span><br><span> checking response:</span><br><span> using message as statically defined for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response contains a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response does not contain a connection id)</span><br><span> </span><br><span> ================================================</span><br><span> Testing AUEP2</span><br><span>@@ -34,7 +34,7 @@</span><br><span> checking response:</span><br><span> using message as statically defined for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response contains a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response does not contain a connection id)</span><br><span> </span><br><span> ================================================</span><br><span> Testing MDCX1</span><br><span>@@ -46,7 +46,7 @@</span><br><span> checking response:</span><br><span> using message as statically defined for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response contains a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response does not contain a connection id)</span><br><span> </span><br><span> ================================================</span><br><span> Testing MDCX2</span><br><span>@@ -58,7 +58,7 @@</span><br><span> checking response:</span><br><span> using message as statically defined for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response contains a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response does not contain a connection id)</span><br><span> </span><br><span> ================================================</span><br><span> Testing CRCX</span><br><span>@@ -79,7 +79,7 @@</span><br><span> checking response:</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response does not contain a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response contains a connection id)</span><br><span> Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span>@@ -93,7 +93,7 @@</span><br><span> checking response:</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response does not contain a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response contains a connection id)</span><br><span> Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span>@@ -117,7 +117,7 @@</span><br><span> checking response:</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response does not contain a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response contains a connection id)</span><br><span> Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span>@@ -141,7 +141,7 @@</span><br><span> checking response:</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response does not contain a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response contains a connection id)</span><br><span> Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span>@@ -165,7 +165,7 @@</span><br><span> checking response:</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response does not contain a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response contains a connection id)</span><br><span> Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span>@@ -189,7 +189,7 @@</span><br><span> checking response:</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response does not contain a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response contains a connection id)</span><br><span> Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span>@@ -213,7 +213,7 @@</span><br><span> checking response:</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response does not contain a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response contains a connection id)</span><br><span> </span><br><span> ================================================</span><br><span> Testing MDCX4_RO</span><br><span>@@ -228,7 +228,7 @@</span><br><span> checking response:</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response does not contain a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response contains a connection id)</span><br><span> Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span>@@ -243,7 +243,7 @@</span><br><span> checking response:</span><br><span> using message as statically defined for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response contains a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response does not contain a connection id)</span><br><span> </span><br><span> ================================================</span><br><span> Testing CRCX_ZYN</span><br><span>@@ -256,7 +256,7 @@</span><br><span> checking response:</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response does not contain a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response contains a connection id)</span><br><span> Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span>@@ -277,7 +277,7 @@</span><br><span> checking response:</span><br><span> using message as statically defined for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response contains a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response does not contain a connection id)</span><br><span> </span><br><span> ================================================</span><br><span> Testing SHORT2</span><br><span>@@ -288,7 +288,7 @@</span><br><span> checking response:</span><br><span> using message as statically defined for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response contains a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response does not contain a connection id)</span><br><span> </span><br><span> ================================================</span><br><span> Testing SHORT3</span><br><span>@@ -299,7 +299,7 @@</span><br><span> checking response:</span><br><span> using message as statically defined for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response contains a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response does not contain a connection id)</span><br><span> </span><br><span> ================================================</span><br><span> Testing SHORT4</span><br><span>@@ -310,7 +310,7 @@</span><br><span> checking response:</span><br><span> using message as statically defined for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response contains a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response does not contain a connection id)</span><br><span> </span><br><span> ================================================</span><br><span> Testing RQNT1</span><br><span>@@ -324,7 +324,7 @@</span><br><span> checking response:</span><br><span> using message as statically defined for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response contains a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response does not contain a connection id)</span><br><span> </span><br><span> ================================================</span><br><span> Testing RQNT2</span><br><span>@@ -338,7 +338,7 @@</span><br><span> checking response:</span><br><span> using message as statically defined for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response contains a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response does not contain a connection id)</span><br><span> </span><br><span> ================================================</span><br><span> Testing DLCX</span><br><span>@@ -352,7 +352,7 @@</span><br><span> checking response:</span><br><span> using message as statically defined for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response contains a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response does not contain a connection id)</span><br><span> </span><br><span> ================================================</span><br><span> Testing CRCX</span><br><span>@@ -373,7 +373,7 @@</span><br><span> checking response:</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response does not contain a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response contains a connection id)</span><br><span> Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span>@@ -387,7 +387,7 @@</span><br><span> checking response:</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response does not contain a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response contains a connection id)</span><br><span> Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span>@@ -402,7 +402,7 @@</span><br><span> checking response:</span><br><span> using message as statically defined for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response contains a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response does not contain a connection id)</span><br><span> </span><br><span> ================================================</span><br><span> Testing CRCX</span><br><span>@@ -416,7 +416,7 @@</span><br><span> checking response:</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response does not contain a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response contains a connection id)</span><br><span> Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span>@@ -439,7 +439,7 @@</span><br><span> checking response:</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span style="color: hsl(0, 100%, 40%);">-(response does not contain a connection id)</span><br><span style="color: hsl(120, 100%, 40%);">+(response contains a connection id)</span><br><span> Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10674">change 10674</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/10674"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Idcd731b9daf618b97d8f7e6a776266071cd29e08 </div>
<div style="display:none"> Gerrit-Change-Number: 10674 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@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: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>