<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9984">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;">tests: ctrl: Test received ERROR messages are handled correctly<br><br>Change-Id: I3c8e95aaa1ca222d4cd1395e548f8461bf9d4cd6<br>---<br>M tests/ctrl/ctrl_test.c<br>M tests/ctrl/ctrl_test.ok<br>2 files changed, 55 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/ctrl/ctrl_test.c b/tests/ctrl/ctrl_test.c</span><br><span>index 8bb917b..cffb803 100644</span><br><span>--- a/tests/ctrl/ctrl_test.c</span><br><span>+++ b/tests/ctrl/ctrl_test.c</span><br><span>@@ -70,18 +70,23 @@</span><br><span> static void assert_test(struct ctrl_handle *ctrl, struct ctrl_connection *ccon, const struct one_test *t)</span><br><span> {</span><br><span> struct ctrl_cmd *cmd;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool parse_failed;</span><br><span> struct msgb *msg = msgb_from_string(t->cmd_str);</span><br><span> int ctx_size_was;</span><br><span> </span><br><span> printf("test: '%s'\n", osmo_escape_str(t->cmd_str, -1));</span><br><span> printf("parsing:\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cmd = ctrl_cmd_parse2(ctx, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd = ctrl_cmd_parse3(ctx, msg, &parse_failed);</span><br><span> OSMO_ASSERT(cmd);</span><br><span> </span><br><span> if (t->expect_parsed.type != cmd->type) {</span><br><span> printf("type mismatch: got %s\n", get_value_string(ctrl_type_vals, cmd->type));</span><br><span> OSMO_ASSERT(t->expect_parsed.type == cmd->type);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("type = '%s'%s\n", get_value_string(ctrl_type_vals, cmd->type),</span><br><span style="color: hsl(120, 100%, 40%);">+ cmd->type != CTRL_TYPE_ERROR ? "" :</span><br><span style="color: hsl(120, 100%, 40%);">+ (parse_failed ? " (parse failure)" : " (error received)"));</span><br><span> }</span><br><span> </span><br><span> #define ASSERT_SAME_STR(field) \</span><br><span>@@ -310,7 +315,20 @@</span><br><span> .reply = "OK",</span><br><span> },</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ { "ERROR 1 some error message",</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = CTRL_TYPE_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = "1",</span><br><span style="color: hsl(120, 100%, 40%);">+ .reply = "some error message",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "ERROR err some error message",</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = CTRL_TYPE_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = "err",</span><br><span style="color: hsl(120, 100%, 40%);">+ .reply = "some error message",</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> static void test_messages()</span><br><span>diff --git a/tests/ctrl/ctrl_test.ok b/tests/ctrl/ctrl_test.ok</span><br><span>index 07f4aac..0705d69 100644</span><br><span>--- a/tests/ctrl/ctrl_test.ok</span><br><span>+++ b/tests/ctrl/ctrl_test.ok</span><br><span>@@ -9,6 +9,7 @@</span><br><span> ctrl type 64 is unknown 0x40 [PARSE FAILED]</span><br><span> test: 'GET 1 variable'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'GET'</span><br><span> id = '1'</span><br><span> variable = 'variable'</span><br><span> value = '(null)'</span><br><span>@@ -18,6 +19,7 @@</span><br><span> ok</span><br><span> test: 'GET 1 variable\n'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'GET'</span><br><span> id = '1'</span><br><span> variable = 'variable'</span><br><span> value = '(null)'</span><br><span>@@ -27,6 +29,7 @@</span><br><span> ok</span><br><span> test: 'GET 1 var\ni\nable'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'ERROR' (parse failure)</span><br><span> id = '1'</span><br><span> reply = 'GET with trailing characters'</span><br><span> handling:</span><br><span>@@ -34,6 +37,7 @@</span><br><span> ok</span><br><span> test: 'GET 1 var\ti\table'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'ERROR' (parse failure)</span><br><span> id = '1'</span><br><span> reply = 'GET variable contains invalid characters'</span><br><span> handling:</span><br><span>@@ -41,6 +45,7 @@</span><br><span> ok</span><br><span> test: 'GET 1 var\ri\rable'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'ERROR' (parse failure)</span><br><span> id = '1'</span><br><span> reply = 'GET variable contains invalid characters'</span><br><span> handling:</span><br><span>@@ -48,6 +53,7 @@</span><br><span> ok</span><br><span> test: 'GET 1 variable value'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'ERROR' (parse failure)</span><br><span> id = '1'</span><br><span> reply = 'GET with trailing characters'</span><br><span> handling:</span><br><span>@@ -55,6 +61,7 @@</span><br><span> ok</span><br><span> test: 'GET 1 variable value\n'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'ERROR' (parse failure)</span><br><span> id = '1'</span><br><span> reply = 'GET with trailing characters'</span><br><span> handling:</span><br><span>@@ -62,6 +69,7 @@</span><br><span> ok</span><br><span> test: 'GET 1 variable multiple value tokens'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'ERROR' (parse failure)</span><br><span> id = '1'</span><br><span> reply = 'GET with trailing characters'</span><br><span> handling:</span><br><span>@@ -69,6 +77,7 @@</span><br><span> ok</span><br><span> test: 'GET 1 variable multiple value tokens\n'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'ERROR' (parse failure)</span><br><span> id = '1'</span><br><span> reply = 'GET with trailing characters'</span><br><span> handling:</span><br><span>@@ -76,6 +85,7 @@</span><br><span> ok</span><br><span> test: 'SET 1 variable value'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'SET'</span><br><span> id = '1'</span><br><span> variable = 'variable'</span><br><span> value = 'value'</span><br><span>@@ -85,6 +95,7 @@</span><br><span> ok</span><br><span> test: 'SET 1 variable value\n'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'SET'</span><br><span> id = '1'</span><br><span> variable = 'variable'</span><br><span> value = 'value'</span><br><span>@@ -94,6 +105,7 @@</span><br><span> ok</span><br><span> test: 'SET weird_id variable value'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'ERROR' (parse failure)</span><br><span> id = 'err'</span><br><span> reply = 'Invalid message ID number'</span><br><span> handling:</span><br><span>@@ -101,6 +113,7 @@</span><br><span> ok</span><br><span> test: 'SET weird_id variable value\n'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'ERROR' (parse failure)</span><br><span> id = 'err'</span><br><span> reply = 'Invalid message ID number'</span><br><span> handling:</span><br><span>@@ -108,6 +121,7 @@</span><br><span> ok</span><br><span> test: 'SET 1 variable multiple value tokens'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'SET'</span><br><span> id = '1'</span><br><span> variable = 'variable'</span><br><span> value = 'multiple value tokens'</span><br><span>@@ -117,6 +131,7 @@</span><br><span> ok</span><br><span> test: 'SET 1 variable multiple value tokens\n'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'SET'</span><br><span> id = '1'</span><br><span> variable = 'variable'</span><br><span> value = 'multiple value tokens'</span><br><span>@@ -126,6 +141,7 @@</span><br><span> ok</span><br><span> test: 'SET 1 variable value_with_trailing_spaces '</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'SET'</span><br><span> id = '1'</span><br><span> variable = 'variable'</span><br><span> value = 'value_with_trailing_spaces '</span><br><span>@@ -135,6 +151,7 @@</span><br><span> ok</span><br><span> test: 'SET 1 variable value_with_trailing_spaces \n'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'SET'</span><br><span> id = '1'</span><br><span> variable = 'variable'</span><br><span> value = 'value_with_trailing_spaces '</span><br><span>@@ -144,6 +161,7 @@</span><br><span> ok</span><br><span> test: 'SET \n special_char_id value'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'ERROR' (parse failure)</span><br><span> id = 'err'</span><br><span> reply = 'Invalid message ID number'</span><br><span> handling:</span><br><span>@@ -151,6 +169,7 @@</span><br><span> ok</span><br><span> test: 'SET \t special_char_id value'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'ERROR' (parse failure)</span><br><span> id = 'err'</span><br><span> reply = 'Invalid message ID number'</span><br><span> handling:</span><br><span>@@ -158,6 +177,7 @@</span><br><span> ok</span><br><span> test: 'GET_REPLY 1 variable OK'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'GET_REPLY'</span><br><span> id = '1'</span><br><span> variable = 'variable'</span><br><span> value = '(null)'</span><br><span>@@ -166,12 +186,27 @@</span><br><span> ok</span><br><span> test: 'SET_REPLY 1 variable OK'</span><br><span> parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'SET_REPLY'</span><br><span> id = '1'</span><br><span> variable = 'variable'</span><br><span> value = '(null)'</span><br><span> reply = 'OK'</span><br><span> handling:</span><br><span> ok</span><br><span style="color: hsl(120, 100%, 40%);">+test: 'ERROR 1 some error message'</span><br><span style="color: hsl(120, 100%, 40%);">+parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'ERROR' (error received)</span><br><span style="color: hsl(120, 100%, 40%);">+id = '1'</span><br><span style="color: hsl(120, 100%, 40%);">+reply = 'some error message'</span><br><span style="color: hsl(120, 100%, 40%);">+handling:</span><br><span style="color: hsl(120, 100%, 40%);">+ok</span><br><span style="color: hsl(120, 100%, 40%);">+test: 'ERROR err some error message'</span><br><span style="color: hsl(120, 100%, 40%);">+parsing:</span><br><span style="color: hsl(120, 100%, 40%);">+type = 'ERROR' (error received)</span><br><span style="color: hsl(120, 100%, 40%);">+id = 'err'</span><br><span style="color: hsl(120, 100%, 40%);">+reply = 'some error message'</span><br><span style="color: hsl(120, 100%, 40%);">+handling:</span><br><span style="color: hsl(120, 100%, 40%);">+ok</span><br><span> </span><br><span> test_deferred_cmd</span><br><span> get_test_defer called</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9984">change 9984</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/9984"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I3c8e95aaa1ca222d4cd1395e548f8461bf9d4cd6 </div>
<div style="display:none"> Gerrit-Change-Number: 9984 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>