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.

Sign up for GitHub

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

Jump to bottom

caching: Improved the tests and coverage of the CacheFilter tree #12544

Merged
merged 23 commits into from
Aug 12, 2020
Merged

caching: Improved the tests and coverage of the CacheFilter tree #12544

merged 23 commits into from
Aug 12, 2020

Conversation

yosrym93
Copy link
Contributor

@yosrym93 yosrym93 commented Aug 7, 2020 •
edited
Loading

Commit Message: Improved the tests and coverage of the CacheFilter tree.
Signed-off-by: Yosry Ahmed [email protected]

Additional Description:

  • Improved the quality of the tests and added test cases covering a wider variety of scenarios.
  • Raise the coverage of the cache tree from 85% to about 94%.
  • Various tests cleaning up.
  • Fixed the cache_filter_integration_test failure on windows and removed the fails_on_windows tag.

Risk Level: Low
Testing: N/A
Docs Changes: N/A
Release Notes: N/A
Fixes #9872 as a side effect.

yosrym93 added 20 commits August 7, 2020 16:30
@yosrym93
Moved stdout operators that are only used in tests to test files
5c6dd34 
Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Added delayed callbacks for body and trailers to DelayedCache and mov…
3b266e3 
…ed it to common.h

Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Improved CacheFilter tests by adding cases for uncacheable requests, …
099eb8d 
…cache misses, and delayed hits with a body - Also added more strict expectations for decoder callbacks to all tests

Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Removed unnecessary local variables from cacheability_utils_test
4d246a3 
Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Improved CacheFilter tests by adding cases for successful/unsuccessfu…
1156916 
…l immediate/delayed validation

Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Cleaning of cache_filter_integration_test
7fcb18f 
Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Improved the readability of a parameterized test
4946f6e 
Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Separated parameterized and non-parameterized tests in cacheability_u…
894b6ab 
…tils_test

Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Improved CacheFilter tests by adding dedicated tests for injecting va…
18fe4a8 
…lidation conditional headers

Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Added a CacheFilter test for uncacheable responses
1b99a5c 
Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Allow responses with no revalidation data but a "no-cache" directive …
be37eb1 
…to be cached as they require being revalidated anyway

Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Added more http_cache_test cases to exercise different cases of cache…
cb730e5 
…d responses that may or may not require validation

Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Parameterized LookupRequest tests
c710228 
Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Made sure all cache tests are in unnamed namespaces
788eff8 
Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Slight readability improvements to cache_filter_integration_test
809cec9 
Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Added more test cases to http_cache_test
951365f 
Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Slight readability improvements
a96d173 
Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Added an invalid date format test for httpTime
bef2b72 
Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Removed the "fails_on_windows" tag from the cache filter integration …
7ab5dd0 
…test to debug it

Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Replaced addCopy and setCopy with setReferenceKey in cache tests
5c43d7c 
Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93 yosrym93 requested a review from jmarantz as a code owner August 7, 2020 17:33
@yosrym93 yosrym93 changed the title cache: Improved the tests and coverage of the CacheFilter tree caching: Improved the tests and coverage of the CacheFilter tree Aug 7, 2020
yosrym93 added 2 commits August 7, 2020 19:09
@yosrym93
Fixed a mix up between setCopy and setReferenceKey in cacheability_ut…
ec22460 
…ils_test

Signed-off-by: Yosry Ahmed <[email protected]>
@yosrym93
Fixed the integration test failing on windows by using HasSubstr to c…
ba6c097 
…heck for log string in stead of equality, as windows adds carriage returns to strings

Signed-off-by: Yosry Ahmed <[email protected]>
@jmarantz jmarantz self-assigned this Aug 10, 2020
@yosrym93
Copy link
Contributor Author

@jmarantz is there anything that I need to do before this is ready for you to take a look?

jmarantz
jmarantz previously approved these changes Aug 12, 2020
View reviewed changes
Copy link
Contributor

@jmarantz jmarantz left a comment

Choose a reason for hiding this comment

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

@envoyproxy/senior-maintainers

@mattklein123
Copy link
Member

Needs a main merge. Thank you.

/wait

@yosrym93
Copy link
Contributor Author

@mattklein123 done!

mattklein123
mattklein123 approved these changes Aug 12, 2020
View reviewed changes
Copy link
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

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

Thank you!

@yosrym93
Copy link
Contributor Author

yosrym93 commented Aug 12, 2020 •
edited
Loading

@mattklein123 After merging master cache_filter_integration_test fails on Windows with:
[critical][assert] [test/integration/integration.cc:500] assert failure: 0. Details: Timed out waiting for listeners.

Which is weird because that test was not changed in the merge commit and it did not have any conflicts. Are there any recent changes to the integration tests framework that may cause this?

@mattklein123
Copy link
Member

It's a flake. We are working on fixing this. You can ignore for now!

@yosrym93
Copy link
Contributor Author

It's a flake. We are working on fixing this. You can ignore for now!

Alright then, the checks are done. This is the only failure.

@mattklein123 mattklein123 merged commit 7f3e8a8 into envoyproxy:master Aug 12, 2020
@yosrym93 yosrym93 deleted the tests branch August 12, 2020 22:39
mpuncel added a commit to mpuncel/envoy that referenced this pull request Aug 14, 2020
@mpuncel
Merge branch 'master' into mpuncel/lua-base64-encode
3d27442 
* master: (67 commits)
  logger: support log control in admin interface and command line option for Fancy Logger (envoyproxy#12369)
  test: fix http_timeout_integration_test flake (envoyproxy#12654)
  [fuzz]added an input check in writefilter fuzzer and added test cases (envoyproxy#12628)
  add 'explicit' restriction. (envoyproxy#12643)
  scoped_rds_integration_test migrate from api v2 to api v3. (envoyproxy#12633)
  fuzz: added fuzz test for listener filter tls_inspector (envoyproxy#12617)
  testing: fix multiple race conditions in simulated time tests (envoyproxy#12527)
  [tls] Move handshaking behavior into SslSocketInfo. (envoyproxy#12571)
  header: getting rid of exception-throwing behaviors in header files [the rest] (envoyproxy#12611)
  router: add new ratelimited retry backoff strategy (envoyproxy#12202)
  [redis_proxy] added a constraint for route.prefix().size() (envoyproxy#12637)
  network: add tcp listener backlog config (envoyproxy#12625)
  runtime: debug log that condition is always true when fractionalPercent numerator > denominator (envoyproxy#12068)
  WatchDog Extension hook (envoyproxy#12416)
  router: add dynamic metadata header formatter (envoyproxy#11858)
  statsd: revert visibility to public (envoyproxy#12621)
  Fix regression of /build_* in gitignore (envoyproxy#12630)
  Added a missing extension point to documentation. (envoyproxy#12620)
  Reverts proxy protocol test on windows (envoyproxy#12619)
  caching: Improved the tests and coverage of the CacheFilter tree (envoyproxy#12544)
  ...

Signed-off-by: Michael Puncel <[email protected]>
@mkbehr mkbehr mentioned this pull request Nov 30, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattklein123 mattklein123 mattklein123 approved these changes

@jmarantz jmarantz jmarantz left review comments

Assignees

@jmarantz jmarantz

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

CacheFilter: Cache::Utils methods need more tests
3 participants
@yosrym93 @mattklein123 @jmarantz