ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-06 11:09:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix failing 'dnahelper' test case

Browse Source
This commit is contained in:
Andrew Bettison 2012-08-09 12:21:40 +09:30
parent 12d8bc0c12
commit ec4384ae7d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dna_helper.c
View File

@ -402,6 +402,8 @@ void handle_reply_line(const char *bufp, size_t len)
WHYF("DNAHELPER reply %s contains empty token -- ignored", alloca_toprint(-1, bufp, len)); WHYF("DNAHELPER reply %s contains empty token -- ignored", alloca_toprint(-1, bufp, len));
else if (!str_is_subscriber_id(sidhex)) else if (!str_is_subscriber_id(sidhex))
WHYF("DNAHELPER reply %s contains invalid token -- ignored", alloca_toprint(-1, bufp, len)); WHYF("DNAHELPER reply %s contains invalid token -- ignored", alloca_toprint(-1, bufp, len));
else if (strncmp(sidhex, request_buffer, SID_STRLEN) != 0)
WHYF("DNAHELPER reply %s contains mismatched token -- ignored", alloca_toprint(-1, bufp, len));
else if (did[0] == '\0') else if (did[0] == '\0')
WHYF("DNAHELPER reply %s contains empty DID -- ignored", alloca_toprint(-1, bufp, len)); WHYF("DNAHELPER reply %s contains empty DID -- ignored", alloca_toprint(-1, bufp, len));
else if (!str_is_did(did)) else if (!str_is_did(did))

2
tests/dnahelper
View File

@ -302,7 +302,7 @@ doc_TokenMismatch="DNA helper returns mismatched token"
test_TokenMismatch() { test_TokenMismatch() {
executeOk_servald dna lookup 000061 executeOk_servald dna lookup 000061
assertStdoutIs "" assertStdoutIs ""
assertGrep --matches=0 "$LOGA" 'ERROR:.*DNAHELPER' assertGrep "$LOGA" 'ERROR:.*DNAHELPER.*mismatched token'
} }
doc_TokenEmpty="DNA helper returns empty token" doc_TokenEmpty="DNA helper returns empty token"