Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vav: fix issues and improve tests #4021

Merged
merged 5 commits into from
Nov 20, 2023
Merged

Conversation

walid-git
Copy link
Member

This PR improves vav_test and fixes two issues in VAV_ParseTxt:

  • vav_test was always returning 0, which makes it always pass make check. Failed tests as expected were not printed in the final report. And the test suite was aborting as soon as a single test would fail.
  • VAV_ParseTxt was not correctly handling "foo" "bar" with no flags, and "foo", "bar" with the ARGV_COMMA flag.

Copy link
Member

@dridi dridi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job!

lib/libvarnish/vav.c Outdated Show resolved Hide resolved
lib/libvarnish/vav.c Outdated Show resolved Hide resolved
lib/libvarnish/vav.c Show resolved Hide resolved
Currently, vav_test always passes make check
Output before:

PASS: <> with flags 7 as expected.
PASS: <foo> with flags 0 as expected.
PASS: <foo bar> with flags 0 as expected.
PASS: <foo bar> with flags 2 as expected.
PASS: <foo,bar> with flags 2 as expected.
PASS: <  foo  bar  > with flags 0 as expected.
PASS: <  foo  ,  bar  > with flags 2 as expected.
PASS: <foo bar > with flags 2 as expected.
PASS: <foo,bar,> with flags 2 as expected.
PASS: <foo "bar baz"> with flags 0 as expected.
PASS: <foo #bar> with flags 0 as expected.
PASS: <foo #bar> with flags 1 as expected.
PASS: <foo#bar> with flags 0 as expected.
PASS: <foo#bar> with flags 1 as expected.
PASS: <\> with flags 4 as expected.
PASS: <\x20> with flags 0 as expected.
PASS: <foo"bar> with flags 4 as expected.
PASS: <"foo""bar"> with flags 4 as expected.

Output after:

PASS: <> with flags 7 as expected.
PASS: <foo> with flags 0 as expected.
PASS: <foo bar> with flags 0 as expected.
PASS: <foo bar> with flags 2 as expected.
PASS: <foo,bar> with flags 2 as expected.
PASS: <  foo  bar  > with flags 0 as expected.
PASS: <  foo  ,  bar  > with flags 2 as expected.
PASS: <foo bar > with flags 2 as expected.
PASS: <foo,bar,> with flags 2 as expected.
PASS: <foo "bar baz"> with flags 0 as expected.
PASS: <foo #bar> with flags 0 as expected.
PASS: <foo #bar> with flags 1 as expected.
PASS: <foo#bar> with flags 0 as expected.
PASS: <foo#bar> with flags 1 as expected.
PASS: <\> with flags 4 as expected.
FAIL: <\> with flags 0 as expected.
FAIL: <\x> with flags 0 as expected.
FAIL: <\x2> with flags 0 as expected.
FAIL: <\x2O> with flags 0 as expected.
PASS: <\x20> with flags 0 as expected.
FAIL: <"foo> with flags 0 as expected.
PASS: <foo"bar> with flags 4 as expected.
FAIL: <foo"bar> with flags 0 as expected.
FAIL: <foo"bar> with flags 0 as expected.
PASS: <"foo""bar"> with flags 4 as expected.
FAIL: <"foo""bar"> with flags 0 as expected.
Cli command '"help" "help"' was wrongly rejected with error
message: "Missing separator between arguments"
@walid-git
Copy link
Member Author

Bugwash: ok

@walid-git walid-git merged commit a167b7e into varnishcache:master Nov 20, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants