Task 4053, convert unit tests to FAIL/PASS API #5497
Conversation
detect/msg: convert to FAIL/PASS API
|
In the git commit message, "detect/msg: convert to FAIL/PASS API" should be the subject line. Referencing to a ticket would be something like "Issue #xxxx" in the message body |
| Signature *sig = NULL; | ||
| const char *teststringparsed = "flow stateless to_server"; | ||
| DetectEngineCtx *de_ctx = DetectEngineCtxInit(); | ||
| if (de_ctx == NULL) | ||
| goto end; | ||
| FAIL_IF(de_ctx == NULL); |
There was a problem hiding this comment.
We have a slightly cleaner macro for checking pointers: FAIL_IF_NULL(ptr).
There was a problem hiding this comment.
Understood! I saw that option at first, but wasn't really sure it was ready for using, because of the issue open that seems to be related to that...
| Signature *sig = NULL; | ||
| const char *teststringparsed = "flow stateless to_server"; | ||
| DetectEngineCtx *de_ctx = DetectEngineCtxInit(); | ||
| if (de_ctx == NULL) | ||
| goto end; | ||
| FAIL_IF(de_ctx == NULL); | ||
|
|
||
| FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01(); | ||
| SCClassConfLoadClassficationConfigFile(de_ctx, fd); | ||
|
|
||
| sig = SigInit(de_ctx, "alert tcp any any -> any any (msg:\"flow stateless to_server\"; flow:stateless,to_server; content:\"flowstatelesscheck\"; classtype:bad-unknown; sid: 40000002; rev: 1;)"); |
There was a problem hiding this comment.
extra points for: declare sig here. This leads to more compact tests.
There was a problem hiding this comment.
Got it, thanks. Following this logic, could lines
FILE *fd = SCClassConfGenerateValidDummyClassConfigFD01();
SCClassConfLoadClassficationConfigFile(de_ctx, fd);
Be moved to the end, where there used to be the check
if(sig != NULL)
I don't see fd being directly used anywhere else, which makes me believe they could. I have checked SCClassConfLoadClassficationConfigFile and it seems it will only use de_ctx, not change it. So it seems that this is something that could sort of be together with the other statements near
PASS
Does that make sense?
|
Thanks for the overall comments. I believe I have done the appropriate changes, and I'll make a new PR now. |
detect/msg: convert to FAIL/PASS API
Make sure these boxes are signed before submitting your Pull Request -- thank you.
Link to redmine ticket:
https://redmine.openinfosecfoundation.org/issues/4053
Describe changes:
PRScript output (if applicable):
#suricata-verify-pr:
#suricata-verify-repo:
#suricata-verify-branch:
#suricata-update-pr:
#suricata-update-repo:
#suricata-update-branch:
#libhtp-pr:
#libhtp-repo:
#libhtp-branch: